Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ jobs:
8.0.*
9.0.*
10.0.*
- name: Setup .NET 11 Preview
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.*
dotnet-quality: preview
- name: Show installed versions
shell: pwsh
run: |
Expand Down Expand Up @@ -166,6 +171,11 @@ jobs:
8.0.*
9.0.*
10.0.*
- name: Setup .NET 11 Preview
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.*
dotnet-quality: preview
- name: Git checkout
uses: actions/checkout@v6
with:
Expand Down Expand Up @@ -229,6 +239,11 @@ jobs:
8.0.*
9.0.*
10.0.*
- name: Setup .NET 11 Preview
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.*
dotnet-quality: preview
- name: Git checkout
uses: actions/checkout@v6
with:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ jobs:
8.0.*
9.0.*
10.0.*
- name: Setup .NET 11 Preview
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.*
dotnet-quality: preview
- name: Git checkout
uses: actions/checkout@v6
with:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/qodana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
8.0.*
9.0.*
10.0.*
- name: Setup .NET 11 Preview
uses: actions/setup-dotnet@v5
with:
dotnet-version: 11.0.*
dotnet-quality: preview
- name: Git checkout
uses: actions/checkout@v6
with:
Expand Down
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
<OpenApiPreviewNumber>8</OpenApiPreviewNumber>
</PropertyGroup>

<PropertyGroup>
<!-- .NET 11 Preview -->
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup>

<PropertyGroup>
<NoWarn>
<!--
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
</PropertyGroup>

Expand Down
36 changes: 32 additions & 4 deletions package-versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
<NewtonsoftJsonFrozenVersion>13.0.4</NewtonsoftJsonFrozenVersion>
<SwashbuckleFrozenVersion>10.1.7</SwashbuckleFrozenVersion>
<SwashbuckleFrozenVersion_NET8_9>10.1.5</SwashbuckleFrozenVersion_NET8_9>
<SwashbuckleFrozenVersion_NET10_11>*-pr.3786.*</SwashbuckleFrozenVersion_NET10_11>
<SystemTextRegularExpressionsFrozenVersion>4.3.1</SystemTextRegularExpressionsFrozenVersion>

<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
Expand All @@ -20,50 +21,77 @@
<GitHubActionsTestLoggerVersion>3.0.*</GitHubActionsTestLoggerVersion>
<InheritDocVersion>2.0.*</InheritDocVersion>
<KiotaVersion>1.*</KiotaVersion>
<MicrosoftApiServerVersion>10.0.*</MicrosoftApiServerVersion>
<MiniValidationVersion>0.9.*</MiniValidationVersion>
<NSwagApiClientVersion>14.7.*</NSwagApiClientVersion>
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
<PolyfillVersion>10.3.*</PolyfillVersion>
<ReadableExpressionsVersion>4.1.*</ReadableExpressionsVersion>
<ScalarAspNetCoreVersion>2.13.*</ScalarAspNetCoreVersion>
<SwashbuckleVersion>10.*-*</SwashbuckleVersion>
<SystemTextJsonVersion>10.0.*</SystemTextJsonVersion>
<SwashbuckleVersion_NET8_9>10.*-*</SwashbuckleVersion_NET8_9>
<TestSdkVersion>18.4.*</TestSdkVersion>
<XunitVersion>2.9.*</XunitVersion>
<XunitVisualStudioVersion>3.1.*</XunitVisualStudioVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net11.0'">
<!-- Published dependencies (only update on major version change) -->
<EntityFrameworkCoreFrozenVersion>11.0.*-*</EntityFrameworkCoreFrozenVersion>
<SwashbuckleFrozenVersion>$(SwashbuckleFrozenVersion_NET10_11)</SwashbuckleFrozenVersion>

<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
<AspNetCoreVersion>11.0.*-*</AspNetCoreVersion>
<EntityFrameworkCoreVersion>11.0.*-*</EntityFrameworkCoreVersion>
<MicrosoftApiServerVersion>11.0.*-*</MicrosoftApiServerVersion>
<PomeloEntityFrameworkCoreVersion>
<!-- Temporary workaround: Unstable EF Core 10 package for Pomelo.EntityFrameworkCore.MySql is not available yet. -->
9.0.*
</PomeloEntityFrameworkCoreVersion>
<SwashbuckleVersion>$(SwashbuckleFrozenVersion)</SwashbuckleVersion>
<SystemTextJsonVersion>11.0.*-*</SystemTextJsonVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
<!-- Published dependencies (only update on major version change) -->
<EntityFrameworkCoreFrozenVersion>10.0.0</EntityFrameworkCoreFrozenVersion>
<SwashbuckleFrozenVersion>$(SwashbuckleFrozenVersion_NET10_11)</SwashbuckleFrozenVersion>

<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
<AspNetCoreVersion>10.0.*</AspNetCoreVersion>
<EntityFrameworkCoreVersion>10.0.*-*</EntityFrameworkCoreVersion>
<MicrosoftApiServerVersion>11.0.*-*</MicrosoftApiServerVersion>
<PomeloEntityFrameworkCoreVersion>
<!-- Temporary workaround: Unstable EF Core 10 package for Pomelo.EntityFrameworkCore.MySql is not available yet. -->
9.0.*
</PomeloEntityFrameworkCoreVersion>
<SwashbuckleVersion>$(SwashbuckleFrozenVersion)</SwashbuckleVersion>
<SystemTextJsonVersion>10.0.*</SystemTextJsonVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
<!-- Published dependencies (only update on major version change) -->
<EntityFrameworkCoreFrozenVersion>N/A</EntityFrameworkCoreFrozenVersion>
<SwashbuckleFrozenVersion>$(SwashbuckleFrozenVersion_NET8_9)</SwashbuckleFrozenVersion>

<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
<AspNetCoreVersion>9.0.*</AspNetCoreVersion>
<EntityFrameworkCoreVersion>9.0.*</EntityFrameworkCoreVersion>
<MicrosoftApiServerVersion>10.0.*</MicrosoftApiServerVersion>
<PomeloEntityFrameworkCoreVersion>$(EntityFrameworkCoreVersion)</PomeloEntityFrameworkCoreVersion>
<SwashbuckleVersion>$(SwashbuckleVersion_NET8_9)</SwashbuckleVersion>
<SystemTextJsonVersion>10.0.*</SystemTextJsonVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
<!-- Published dependencies (only update on major version change) -->
<EntityFrameworkCoreFrozenVersion>8.0.0</EntityFrameworkCoreFrozenVersion>
<SwashbuckleFrozenVersion>$(SwashbuckleFrozenVersion_NET8_9)</SwashbuckleFrozenVersion>

<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
<EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
<MicrosoftApiServerVersion>10.0.*</MicrosoftApiServerVersion>
<PomeloEntityFrameworkCoreVersion>$(EntityFrameworkCoreVersion)</PomeloEntityFrameworkCoreVersion>
<SwashbuckleVersion>$(SwashbuckleVersion_NET8_9)</SwashbuckleVersion>
<SystemTextJsonVersion>10.0.*</SystemTextJsonVersion>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Examples/DapperExample/DapperExample.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\..\package-versions.props" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\..\package-versions.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Examples/GettingStarted/GettingStarted.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\..\package-versions.props" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
<OpenApiGenerateDocumentsOnBuild>true</OpenApiGenerateDocumentsOnBuild>
<OpenApiDocumentsDirectory>GeneratedSwagger</OpenApiDocumentsDirectory>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\..\package-versions.props" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\..\package-versions.props" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>

<Import Project="..\..\..\package-versions.props" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">
<PropertyGroup>
<!-- TargetFrameworks does not work, see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2706 -->
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>

<Import Project="..\..\..\package-versions.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Examples/ReportsExample/ReportsExample.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\..\package-versions.props" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net8.0;netstandard1.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net8.0;netstandard1.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<RootNamespace>JsonApiDotNetCore</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net8.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net8.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net8.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
Expand Down
2 changes: 1 addition & 1 deletion src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net8.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/AnnotationTests/AnnotationTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0;netstandard2.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\package-versions.props" />
Expand Down
2 changes: 1 addition & 1 deletion test/DapperTests/DapperTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\package-versions.props" />
Expand Down
4 changes: 2 additions & 2 deletions test/DiscoveryTests/DiscoveryTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\package-versions.props" />
Expand Down
7 changes: 7 additions & 0 deletions test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,13 @@ public override DbContextOptions WithExtension<TExtension>(TExtension extension)
{
return this;
}

#if NET11_0_OR_GREATER
public override DbContextOptions WithoutExtension<TExtension>()
{
return this;
}
#endif
}
}
}
2 changes: 1 addition & 1 deletion test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\package-versions.props" />
Expand Down
2 changes: 1 addition & 1 deletion test/MultiDbContextTests/MultiDbContextTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\package-versions.props" />
Expand Down
2 changes: 1 addition & 1 deletion test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
</PropertyGroup>

<Import Project="..\..\package-versions.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -500,8 +500,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
[InlineData(nameof(TypeContainer.TestNullableIPAddress), "An invalid IP address was specified.")]
[InlineData(nameof(TypeContainer.TestIPNetwork), "An invalid IP network was specified.")]
[InlineData(nameof(TypeContainer.TestNullableIPNetwork), "An invalid IP network was specified.")]
[InlineData(nameof(TypeContainer.TestVersion), "The JSON value is not in a supported Version format.")]
[InlineData(nameof(TypeContainer.TestNullableVersion), "The JSON value is not in a supported Version format.")]
[InlineData(nameof(TypeContainer.TestVersion), "The JSON value could not be converted to System.Version.")]
[InlineData(nameof(TypeContainer.TestNullableVersion), "The JSON value could not be converted to System.Version.")]
public async Task Cannot_update_resource_with_attribute_set_to_invalid_value(string propertyName, string innerParseError)
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>

<Import Project="..\..\package-versions.props" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- TargetFrameworks does not work, see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2706 -->
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>

<Import Project="..\..\package-versions.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
[InlineData(nameof(TypeContainer.TestNullableIPAddress), "An invalid IP address was specified.")]
[InlineData(nameof(TypeContainer.TestIPNetwork), "An invalid IP network was specified.")]
[InlineData(nameof(TypeContainer.TestNullableIPNetwork), "An invalid IP network was specified.")]
[InlineData(nameof(TypeContainer.TestVersion), "The JSON value is not in a supported Version format.")]
[InlineData(nameof(TypeContainer.TestNullableVersion), "The JSON value is not in a supported Version format.")]
[InlineData(nameof(TypeContainer.TestVersion), "The JSON value could not be converted to System.Version.")]
[InlineData(nameof(TypeContainer.TestNullableVersion), "The JSON value could not be converted to System.Version.")]
public async Task Cannot_update_resource_with_attribute_set_to_invalid_value(string propertyName, string innerParseError)
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- TargetFrameworks does not work, see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2706 -->
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>

<Import Project="..\..\package-versions.props" />
Expand Down
Loading
Loading