Skip to content

Update ProducesResponseTypeMetadata to support .NET 10 Preview 2 #50

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

Open
ctyar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update ProducesResponseTypeMetadata to support .NET 10 Preview 2 #50

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
17 changes: 10 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,20 @@
<PackageVersion Include="Dapper" Version="2.0.123" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="6.0.0" Condition="'$(TargetFramework)'=='net6.0'" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.0" Condition="'$(TargetFramework)'=='net7.0'" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0-preview.2.25163.8" Condition="'$(TargetFramework)'=='net10.0'" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.4.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25107-01" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="Moq.Dapper" Version="1.0.4" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.2" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.11" Condition="'$(TargetFramework)'=='net6.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" Condition="'$(TargetFramework)'=='net7.0'" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="6.0.11" Condition="'$(TargetFramework)'=='net6.0'" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="7.0.0" Condition="'$(TargetFramework)'=='net7.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.36" Condition="'$(TargetFramework)'=='net6.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.20" Condition="'$(TargetFramework)'=='net7.0'" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-preview.2.25164.1 " Condition="'$(TargetFramework)'=='net10.0'" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="6.0.36" Condition="'$(TargetFramework)'=='net6.0'" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="7.0.20" Condition="'$(TargetFramework)'=='net7.0'" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.0-preview.2.25164.1" Condition="'$(TargetFramework)'=='net10.0'" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "7.0.100",
"version": "10.0.100-preview.2.25164.34",
"rollForward": "feature",
"allowPrerelease": false
"allowPrerelease": true
}
}
5 changes: 2 additions & 3 deletions src/MinimalApis.Extensions/Binding/BindOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Microsoft.AspNetCore.Http.Metadata;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using MinimalApis.Extensions.Metadata;

namespace MinimalApis.Extensions.Binding;

Expand Down Expand Up @@ -113,8 +112,8 @@ private static void PopulateMetadataImpl(ParameterInfo parameter, IList<object>
}
else
{
metadata.Add(new AcceptsMetadata(typeof(TValue)));
};
metadata.Add(new MinimalApis.Extensions.Metadata.AcceptsMetadata(typeof(TValue)));
}
}

private const string Template_ResolvedFromDI = nameof(IParameterBinder<object>) + "<{ParameterBinderTargetTypeName}> resolved from DI container.";
Expand Down
3 changes: 1 addition & 2 deletions src/MinimalApis.Extensions/Binding/BodyOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http.Metadata;
using Microsoft.Net.Http.Headers;
using MinimalApis.Extensions.Metadata;

namespace MinimalApis.Extensions.Binding;

Expand Down Expand Up @@ -231,7 +230,7 @@ private static void PopulateMetadataImpl(ParameterInfo parameter, IList<object>
{
if (typeof(TBody) == typeof(string))
{
metadata.Add(new AcceptsMetadata(typeof(string), AcceptsMetadata.TextPlainContentType));
metadata.Add(new MinimalApis.Extensions.Metadata.AcceptsMetadata(typeof(string), MinimalApis.Extensions.Metadata.AcceptsMetadata.TextPlainContentType));
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/MinimalApis.Extensions/Binding/JsonFormFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using Microsoft.AspNetCore.Http.Json;
using Microsoft.AspNetCore.Http.Metadata;
using Microsoft.Extensions.DependencyInjection;
using MinimalApis.Extensions.Metadata;

namespace MinimalApis.Extensions.Binding;

Expand Down Expand Up @@ -208,7 +207,7 @@ public static void PopulateMetadata(ParameterInfo parameter, IList<object> metad

private static void PopulateMetadataImpl(ParameterInfo parameter, IList<object> metadata, IServiceProvider services)
{
metadata.Add(new AcceptsMetadata(AcceptsMetadata.MultipartFormContentType));
metadata.Add(new MinimalApis.Extensions.Metadata.AcceptsMetadata(Metadata.AcceptsMetadata.MultipartFormContentType));
// TODO: Ensure this metadata is consumed by EndpointMetadataProviderApiDescriptionProvider to configure the parameter
// such that the Swagger UI will render the file upload UI automatically.
metadata.Add(new Mvc.ApiExplorer.ApiParameterDescription { Name = parameter.Name ?? "file", Source = Mvc.ModelBinding.BindingSource.FormFile });
Expand Down
3 changes: 1 addition & 2 deletions src/MinimalApis.Extensions/Metadata/IEndpointParameterMetadataProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System.Reflection;
using Microsoft.AspNetCore.Builder;
using MinimalApis.Extensions.Metadata;

namespace Microsoft.AspNetCore.Http.Metadata;

Expand Down Expand Up @@ -29,7 +28,7 @@ public static void PopulateDefaultMetadataForWrapperType<TValue>(ParameterInfo p
return;
}

metadata.Add(new AcceptsMetadata(typeof(TValue), false, DefaultAcceptsContentTypes));
metadata.Add(new MinimalApis.Extensions.Metadata.AcceptsMetadata(typeof(TValue), false, DefaultAcceptsContentTypes));
}

#if NET7_0_OR_GREATER
Expand Down
5 changes: 5 additions & 0 deletions src/MinimalApis.Extensions/Metadata/ProducesResponseTypeMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ private ProducesResponseTypeMetadata(Type? type, int statusCode, IEnumerable<str
/// </summary>
public int StatusCode { get; set; }

/// <summary>
/// Gets the description of the response.
/// </summary>
public string? Description { get; set; }

public IEnumerable<string> ContentTypes => _contentTypes;

//internal static ProducesResponseTypeMetadata CreateUnvalidated(Type? type, int statusCode, IEnumerable<string> contentTypes) => new(type, statusCode, contentTypes);
Expand Down
2 changes: 1 addition & 1 deletion src/MinimalApis.Extensions/MinimalApis.Extensions.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>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net10.0</TargetFrameworks>
<Description>A set of extensions and helpers for working with ASP.NET Core Minimal APIs.</Description>
<PackageTags>ASP.NET Web MinimalApis Apis REST Binding IResult</PackageTags>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down
2 changes: 1 addition & 1 deletion tests/MinimalApis.Extensions.UnitTests/MinimalApis.Extensions.UnitTests.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>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/TodosApi.Dapper.UnitTests/TodosApi.Dapper.UnitTests.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>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/TodosApis.Dapper.IntegrationTests/TodosApis.Dapper.IntegrationTests.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>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down