diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86004bf783..7c12036e5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | @@ -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: @@ -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: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bc7d4bd9e8..95522519b6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -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: diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index df40a573e6..48b00fd1f9 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -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: diff --git a/Directory.Build.props b/Directory.Build.props index b4e7923a34..760f220703 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,6 +14,11 @@ 8 + + + true + + @@ -20,50 +21,77 @@ 3.0.* 2.0.* 1.* - 10.0.* 0.9.* 14.7.* 13.0.* 10.3.* 4.1.* 2.13.* - 10.*-* - 10.0.* + 10.*-* 18.4.* 2.9.* 3.1.* + + + 11.0.*-* + $(SwashbuckleFrozenVersion_NET10_11) + + + 11.0.*-* + 11.0.*-* + 11.0.*-* + + + 9.0.* + + $(SwashbuckleFrozenVersion) + 11.0.*-* + + 10.0.0 + $(SwashbuckleFrozenVersion_NET10_11) 10.0.* 10.0.*-* + 11.0.*-* 9.0.* + $(SwashbuckleFrozenVersion) + 10.0.* N/A + $(SwashbuckleFrozenVersion_NET8_9) 9.0.* 9.0.* + 10.0.* $(EntityFrameworkCoreVersion) + $(SwashbuckleVersion_NET8_9) + 10.0.* 8.0.0 + $(SwashbuckleFrozenVersion_NET8_9) 8.0.* 8.0.* + 10.0.* $(EntityFrameworkCoreVersion) + $(SwashbuckleVersion_NET8_9) + 10.0.* diff --git a/src/Examples/DapperExample/DapperExample.csproj b/src/Examples/DapperExample/DapperExample.csproj index f34631b4a8..4e7355b9c2 100644 --- a/src/Examples/DapperExample/DapperExample.csproj +++ b/src/Examples/DapperExample/DapperExample.csproj @@ -1,6 +1,6 @@ - + - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj b/src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj index c7cee804b1..8bdd3ce024 100644 --- a/src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj +++ b/src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Examples/GettingStarted/GettingStarted.csproj b/src/Examples/GettingStarted/GettingStarted.csproj index 806fdf45a5..d78aa32b1a 100644 --- a/src/Examples/GettingStarted/GettingStarted.csproj +++ b/src/Examples/GettingStarted/GettingStarted.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj index 58feac6a6d..49dbecd0f3 100644 --- a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj +++ b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 true GeneratedSwagger diff --git a/src/Examples/MultiDbContextExample/MultiDbContextExample.csproj b/src/Examples/MultiDbContextExample/MultiDbContextExample.csproj index 806fdf45a5..d78aa32b1a 100644 --- a/src/Examples/MultiDbContextExample/MultiDbContextExample.csproj +++ b/src/Examples/MultiDbContextExample/MultiDbContextExample.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj index e50874f733..358b40b311 100644 --- a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj +++ b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj b/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj index 8dd3e2e4df..f46857c4e0 100644 --- a/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj +++ b/src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj @@ -1,6 +1,6 @@ - net10.0 + net11.0 diff --git a/src/Examples/OpenApiNSwagClientExample/OpenApiNSwagClientExample.csproj b/src/Examples/OpenApiNSwagClientExample/OpenApiNSwagClientExample.csproj index 5523c5eba3..0452ef7665 100644 --- a/src/Examples/OpenApiNSwagClientExample/OpenApiNSwagClientExample.csproj +++ b/src/Examples/OpenApiNSwagClientExample/OpenApiNSwagClientExample.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 diff --git a/src/Examples/ReportsExample/ReportsExample.csproj b/src/Examples/ReportsExample/ReportsExample.csproj index 73a16ddf4f..7c6fc9cd46 100644 --- a/src/Examples/ReportsExample/ReportsExample.csproj +++ b/src/Examples/ReportsExample/ReportsExample.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj b/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj index fd646bfd78..6fe99fb34d 100644 --- a/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj +++ b/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj @@ -1,6 +1,6 @@ - net10.0;net8.0;netstandard1.0 + net11.0;net10.0;net8.0;netstandard1.0 true true JsonApiDotNetCore diff --git a/src/JsonApiDotNetCore.OpenApi.Client.Kiota/JsonApiDotNetCore.OpenApi.Client.Kiota.csproj b/src/JsonApiDotNetCore.OpenApi.Client.Kiota/JsonApiDotNetCore.OpenApi.Client.Kiota.csproj index fce1fb7c40..f33183e583 100644 --- a/src/JsonApiDotNetCore.OpenApi.Client.Kiota/JsonApiDotNetCore.OpenApi.Client.Kiota.csproj +++ b/src/JsonApiDotNetCore.OpenApi.Client.Kiota/JsonApiDotNetCore.OpenApi.Client.Kiota.csproj @@ -1,6 +1,6 @@ - + - net10.0;net8.0 + net11.0;net10.0;net8.0 true true false diff --git a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiDotNetCore.OpenApi.Client.NSwag.csproj b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiDotNetCore.OpenApi.Client.NSwag.csproj index 550f284509..301d4da262 100644 --- a/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiDotNetCore.OpenApi.Client.NSwag.csproj +++ b/src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiDotNetCore.OpenApi.Client.NSwag.csproj @@ -1,6 +1,6 @@ - + - net10.0;net8.0 + net11.0;net10.0;net8.0 true true false diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj index a32d89a5ec..d95b74e4fc 100644 --- a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj +++ b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj @@ -1,6 +1,6 @@ - net10.0;net8.0 + net11.0;net10.0;net8.0 true true false diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj index bcc77754b2..d849551278 100644 --- a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj +++ b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj @@ -1,6 +1,6 @@ - net10.0;net8.0 + net11.0;net10.0;net8.0 true true diff --git a/test/AnnotationTests/AnnotationTests.csproj b/test/AnnotationTests/AnnotationTests.csproj index 6d2bfff1e6..6fbfdf535b 100644 --- a/test/AnnotationTests/AnnotationTests.csproj +++ b/test/AnnotationTests/AnnotationTests.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0;netstandard2.0 + net11.0;net10.0;net9.0;net8.0;netstandard2.0 diff --git a/test/DapperTests/DapperTests.csproj b/test/DapperTests/DapperTests.csproj index d4b9a3e661..ce501497a3 100644 --- a/test/DapperTests/DapperTests.csproj +++ b/test/DapperTests/DapperTests.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/test/DiscoveryTests/DiscoveryTests.csproj b/test/DiscoveryTests/DiscoveryTests.csproj index d92d81790f..979e02a434 100644 --- a/test/DiscoveryTests/DiscoveryTests.csproj +++ b/test/DiscoveryTests/DiscoveryTests.csproj @@ -1,6 +1,6 @@ - + - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs b/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs index 2e0974da50..c75623a09e 100644 --- a/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs +++ b/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs @@ -124,6 +124,13 @@ public override DbContextOptions WithExtension(TExtension extension) { return this; } + +#if NET11_0_OR_GREATER + public override DbContextOptions WithoutExtension() + { + return this; + } +#endif } } } diff --git a/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj b/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj index e74bbc8d3d..2da6b9d384 100644 --- a/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj +++ b/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/test/MultiDbContextTests/MultiDbContextTests.csproj b/test/MultiDbContextTests/MultiDbContextTests.csproj index 524270f7e2..0e568b4ac8 100644 --- a/test/MultiDbContextTests/MultiDbContextTests.csproj +++ b/test/MultiDbContextTests/MultiDbContextTests.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj b/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj index 9ff82322ba..5eb997513c 100644 --- a/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj +++ b/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/test/OpenApiKiotaEndToEndTests/AttributeTypes/AttributeTypeTests.cs b/test/OpenApiKiotaEndToEndTests/AttributeTypes/AttributeTypeTests.cs index 5ee0786722..cac43e4f75 100644 --- a/test/OpenApiKiotaEndToEndTests/AttributeTypes/AttributeTypeTests.cs +++ b/test/OpenApiKiotaEndToEndTests/AttributeTypes/AttributeTypeTests.cs @@ -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 diff --git a/test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj b/test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj index b3c6215934..db7df6e9f3 100644 --- a/test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj +++ b/test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj @@ -1,6 +1,6 @@ - net10.0 + net11.0 diff --git a/test/OpenApiNSwagClientTests/OpenApiNSwagClientTests.csproj b/test/OpenApiNSwagClientTests/OpenApiNSwagClientTests.csproj index 552d4e74c1..be843fddd6 100644 --- a/test/OpenApiNSwagClientTests/OpenApiNSwagClientTests.csproj +++ b/test/OpenApiNSwagClientTests/OpenApiNSwagClientTests.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 diff --git a/test/OpenApiNSwagEndToEndTests/AttributeTypes/AttributeTypeTests.cs b/test/OpenApiNSwagEndToEndTests/AttributeTypes/AttributeTypeTests.cs index 8b1561ace9..fc6620618c 100644 --- a/test/OpenApiNSwagEndToEndTests/AttributeTypes/AttributeTypeTests.cs +++ b/test/OpenApiNSwagEndToEndTests/AttributeTypes/AttributeTypeTests.cs @@ -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 diff --git a/test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj b/test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj index c05f841f49..91c9a89bd9 100644 --- a/test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj +++ b/test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj @@ -1,7 +1,7 @@ - + - net10.0 + net11.0 diff --git a/test/OpenApiTests/OpenApiTests.csproj b/test/OpenApiTests/OpenApiTests.csproj index 5700b77798..689f479ed5 100644 --- a/test/OpenApiTests/OpenApiTests.csproj +++ b/test/OpenApiTests/OpenApiTests.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0 True false $(NoWarn);1591 diff --git a/test/SourceGeneratorTests/SourceGeneratorTests.csproj b/test/SourceGeneratorTests/SourceGeneratorTests.csproj index 61946fbc1a..d89506257a 100644 --- a/test/SourceGeneratorTests/SourceGeneratorTests.csproj +++ b/test/SourceGeneratorTests/SourceGeneratorTests.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/test/TestBuildingBlocks/TestBuildingBlocks.csproj b/test/TestBuildingBlocks/TestBuildingBlocks.csproj index 3174e64374..bf2006e08b 100644 --- a/test/TestBuildingBlocks/TestBuildingBlocks.csproj +++ b/test/TestBuildingBlocks/TestBuildingBlocks.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/test/UnitTests/UnitTests.csproj b/test/UnitTests/UnitTests.csproj index 503547d0c5..53335eee4d 100644 --- a/test/UnitTests/UnitTests.csproj +++ b/test/UnitTests/UnitTests.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0