Skip to content

Update to .NET 10 RC1 #3556

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

Merged
merged 2 commits into from
Sep 9, 2025
Merged

Update to .NET 10 RC1 #3556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ef4623
Update to .NET 10 RC1
martincostello Sep 9, 2025
1400d3d
Fix/suppress obsolete warnings
martincostello Sep 9, 2025
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
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.100-preview.7.25380.108",
"version": "10.0.100-rc.1.25451.107",
"allowPrerelease": false,
"rollForward": "latestMajor",
"paths": [ ".dotnet", "$host$" ]
Expand Down
2 changes: 1 addition & 1 deletion src/Swashbuckle.AspNetCore.ApiTesting/Swashbuckle.AspNetCore.ApiTesting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="10.0.0-rc.1.25451.107" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Swashbuckle.AspNetCore.Cli/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,12 @@ private static IServiceProvider GetServiceProvider(Assembly startupAssembly)
return host.Services;
}

#pragma warning disable ASPDEPR008
if (TryGetCustomHost(startupAssembly, "SwaggerWebHostFactory", "CreateWebHost", out IWebHost webHost))
{
return webHost.Services;
}
#pragma warning restore ASPDEPR008

try
{
Expand Down
2 changes: 1 addition & 1 deletion src/Swashbuckle.AspNetCore.Newtonsoft/Swashbuckle.AspNetCore.Newtonsoft.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" VersionOverride="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" VersionOverride="10.0.0-rc.1.25451.107" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Swashbuckle.AspNetCore/Swashbuckle.AspNetCore.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency id="Swashbuckle.AspNetCore.Swagger" version="$version$" exclude="Build,Analyzers" />
<dependency id="Swashbuckle.AspNetCore.SwaggerGen" version="$version$" exclude="Build,Analyzers" />
<dependency id="Swashbuckle.AspNetCore.SwaggerUI" version="$version$" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.ApiDescription.Server" version="10.0.0-preview.7.25380.108" />
<dependency id="Microsoft.Extensions.ApiDescription.Server" version="10.0.0-rc.1.25451.107" />
</group>
</dependencies>
</metadata>
Expand Down
6 changes: 3 additions & 3 deletions test/Swashbuckle.AspNetCore.IntegrationTests/CustomDocumentSerializerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public async Task DocumentProvider_Writes_Custom_V3_Document()
{
var testSite = new TestSite(typeof(CustomDocumentSerializer.Startup), outputHelper);
var server = testSite.BuildServer();
var services = server.Host.Services;
var services = server.Services;

var documentProvider = services.GetService<IDocumentProvider>();
using var stream = new MemoryStream();
Expand All @@ -91,7 +91,7 @@ public async Task DocumentProvider_Writes_Custom_V3_1_Document()
{
var testSite = new TestSite(typeof(CustomDocumentSerializer.Startup), outputHelper);
var server = testSite.BuildServer();
var services = server.Host.Services;
var services = server.Services;

var documentProvider = services.GetService<IDocumentProvider>();
var options = services.GetService<IOptions<SwaggerOptions>>();
Expand Down Expand Up @@ -125,7 +125,7 @@ private async Task DocumentProviderWritesCustomV2Document(Action<SwaggerOptions>
{
var testSite = new TestSite(typeof(CustomDocumentSerializer.Startup), outputHelper);
var server = testSite.BuildServer();
var services = server.Host.Services;
var services = server.Services;

var documentProvider = services.GetService<IDocumentProvider>();
var options = services.GetService<IOptions<SwaggerOptions>>();
Expand Down
6 changes: 3 additions & 3 deletions test/Swashbuckle.AspNetCore.IntegrationTests/DocumentProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void DocumentProvider_ExposesAllDocumentNames(Type startupType, string[]
{
var testSite = new TestSite(startupType, outputHelper);
var server = testSite.BuildServer();
var services = server.Host.Services;
var services = server.Services;
var documentProvider = (IDocumentProvider)services.GetService(typeof(IDocumentProvider));

var documentNames = documentProvider.GetDocumentNames();
Expand All @@ -37,7 +37,7 @@ public async Task DocumentProvider_ExposesGeneratedSwagger(Type startupType, str
{
var testSite = new TestSite(startupType, outputHelper);
var server = testSite.BuildServer();
var services = server.Host.Services;
var services = server.Services;

var documentProvider = (IDocumentProvider)services.GetService(typeof(IDocumentProvider));
using var stream = new MemoryStream();
Expand All @@ -59,7 +59,7 @@ public async Task DocumentProvider_ThrowsUnknownDocument_IfUnknownDocumentName()
{
var testSite = new TestSite(typeof(Basic.Startup), outputHelper);
var server = testSite.BuildServer();
var services = server.Host.Services;
var services = server.Services;

var documentProvider = (IDocumentProvider)services.GetService(typeof(IDocumentProvider));
using var writer = new StringWriter();
Expand Down
4 changes: 2 additions & 2 deletions test/Swashbuckle.AspNetCore.IntegrationTests/Swashbuckle.AspNetCore.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="10.0.0-preview.7.25380.108" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="10.0.0-preview.7.25380.108" />
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="10.0.0-rc.1.25451.107" />
<PackageReference Update="Microsoft.AspNetCore.TestHost" VersionOverride="10.0.0-rc.1.25451.107" />
</ItemGroup>

</Project>
3 changes: 3 additions & 0 deletions test/Swashbuckle.AspNetCore.IntegrationTests/TestSite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public TestServer BuildServer()
var startupAssembly = startupType.Assembly;
var applicationName = startupAssembly.GetName().Name;

#pragma warning disable ASPDEPR004, ASPDEPR008
// TODO Use WebApplicationFactory
var builder = new WebHostBuilder()
.UseEnvironment("Development")
.UseSolutionRelativeContentRoot(Path.Combine("test", "WebSites", applicationName), "*.slnx")
Expand All @@ -27,6 +29,7 @@ public TestServer BuildServer()
});

return new(builder);
#pragma warning restore ASPDEPR004, ASPDEPR008
}

public HttpClient BuildClient()
Expand Down
3 changes: 3 additions & 0 deletions test/Swashbuckle.AspNetCore.IntegrationTests/TestSiteAutofaq.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ public TestServer BuildServer()
var startupAssembly = _startupType.Assembly;
var applicationName = startupAssembly.GetName().Name;

#pragma warning disable ASPDEPR004, ASPDEPR008
// TODO Use WebApplicationFactory
var hostBuilder = new WebHostBuilder()
.UseEnvironment("Development")
.ConfigureServices(services => services.AddAutofac())
.UseSolutionRelativeContentRoot(Path.Combine("test", "WebSites", applicationName), "*.slnx")
.UseStartup(_startupType);

return new TestServer(hostBuilder);
#pragma warning restore ASPDEPR004, ASPDEPR008
}

public HttpClient BuildClient()
Expand Down
2 changes: 1 addition & 1 deletion test/WebSites/OAuth2Integration/OAuth2Integration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" VersionOverride="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" VersionOverride="10.0.0-rc.1.25451.107" />
<PackageReference Include="Duende.IdentityServer" VersionOverride="7.3.1" />
</ItemGroup>

Expand Down
Loading