Skip to content

Commit 9013864

Browse files
Update to ASP.NET Core 11 preview 1
- Update to preview 1 of ASP.NET Core 11. - Drop support for .NET 8 and 9.
1 parent 9a090eb commit 9013864

File tree

188 files changed

+288
-9782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+288
-9782
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ jobs:
7575
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
7676
with:
7777
dotnet-version: |
78-
8.0.x
79-
9.0.x
78+
10.0.x
8079
8180
- name: Setup Node
8281
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0

Directory.Build.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Company>https://github.com/domaindrivendev/Swashbuckle.AspNetCore</Company>
99
<ContinuousIntegrationBuild Condition=" '$(CI)' != '' ">true</ContinuousIntegrationBuild>
1010
<Copyright>Copyright (c) 2016-$([System.DateTime]::Now.ToString(yyyy)) Richard Morris</Copyright>
11-
<DefaultTargetFrameworks>net10.0;net9.0;net8.0</DefaultTargetFrameworks>
11+
<DefaultTargetFrameworks>net11.0;net10.0</DefaultTargetFrameworks>
1212
<Deterministic>true</Deterministic>
1313
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1414
<EnablePackageValidation>$(IsPackable)</EnablePackageValidation>
@@ -18,6 +18,8 @@
1818
<LangVersion>latest</LangVersion>
1919
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
2020
<NeutralLanguage>en-US</NeutralLanguage>
21+
<!-- TODO Remove before merge -->
22+
<NoWarn>$(NoWarn);NU5104</NoWarn>
2123
<NuGetAuditMode>direct</NuGetAuditMode>
2224
<!--
2325
TODO Go through the code and add nullable annotations
@@ -35,6 +37,7 @@
3537
<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
3638
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
3739
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
40+
<TestTfmsInParallel>false</TestTfmsInParallel>
3841
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3942
<UseArtifactsOutput>true</UseArtifactsOutput>
4043
<VersionPrefix>10.1.4</VersionPrefix>

Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<PackageVersion Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
99
<PackageVersion Include="JunitXml.TestLogger" Version="8.0.0" />
1010
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.7.0" />
11-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.22" />
12-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.22" />
11+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.3" />
12+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
1313
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
1414
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
15-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.22" />
15+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.3" />
1616
<PackageVersion Include="Microsoft.Build" Version="18.0.2" />
1717
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
18-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.1" />
18+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="11.0.0-preview.1.26104.118" />
1919
<PackageVersion Include="Microsoft.Kiota.Bundle" Version="1.21.3" />
2020
<PackageVersion Include="Microsoft.OpenApi" Version="2.4.1" />
2121
<PackageVersion Include="Microsoft.OpenApi.YamlReader" Version="2.4.1" />

README.md

Lines changed: 3 additions & 0 deletions

benchmark.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#Requires -Version 7
55

66
param(
7-
[Parameter(Mandatory = $false)][string] $Framework = "net10.0",
7+
[Parameter(Mandatory = $false)][string] $Framework = "net11.0",
88
[Parameter(Mandatory = $false)][string] $Job = ""
99
)
1010

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.103",
3+
"version": "11.0.100-preview.1.26104.118",
44
"allowPrerelease": false,
55
"rollForward": "latestMajor",
66
"paths": [ ".dotnet", "$host$" ]

perf/Swashbuckle.AspNetCore.Benchmarks/Swashbuckle.AspNetCore.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>false</IsPackable>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net10.0</TargetFramework>
5+
<TargetFramework>net11.0</TargetFramework>
66
<SignAssembly>True</SignAssembly>
77
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\src\Swashbuckle.AspNetCore.Swagger\Swashbuckle.AspNetCore.Swagger.snk</AssemblyOriginatorKeyFile>
88
</PropertyGroup>

src/Shared/JsonExtensions.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,10 @@ internal static class JsonExtensions
77
{
88
private static readonly JsonSerializerOptions Options = new()
99
{
10-
#if NET9_0_OR_GREATER
1110
NewLine = "\n",
12-
#endif
1311
WriteIndented = true,
1412
};
1513

1614
public static string ToJson(this JsonNode value)
17-
{
18-
var json = value.ToJsonString(Options);
19-
20-
#if !NET9_0_OR_GREATER
21-
json = json.Replace("\r\n", "\n");
22-
#endif
23-
24-
return json;
25-
}
15+
=> value.ToJsonString(Options);
2616
}

src/Swashbuckle.AspNetCore.Annotations/PublicAPI/net8.0/PublicAPI.Shipped.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/Swashbuckle.AspNetCore.Annotations/PublicAPI/net8.0/PublicAPI.Unshipped.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)