Skip to content

[main] Source code updates from dotnet/dotnet #62019

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

Jump to bottom
Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

[main] Source code updates from dotnet/dotnet #62019

wants to merge 9 commits into from
+911 −307

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented May 20, 2025 •
edited
Loading

Note

This is a codeflow update. It may contain both source code changes from the VMR as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Updated Dependencies

@github-actions github-actions bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label May 20, 2025
dotnet-policy-service[bot]
dotnet-policy-service bot approved these changes May 20, 2025
View reviewed changes
Copy link
Contributor

@dotnet-policy-service dotnet-policy-service bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approving dependency update.

@lewing
Copy link
Member

lewing commented May 20, 2025

cc @akoeplinger

@akoeplinger
Copy link
Member

source-build fails with failures like this

src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/Microsoft.AspNetCore.App.SourceGenerators.csproj(0,0): error NU1608: (NETCORE_ENGINEERING_TELEMETRY=Restore) Warning As Error: Detected package version outside of dependency constraint: Microsoft.CodeAnalysis.CSharp 3.3.1 requires Microsoft.CodeAnalysis.Common (= 3.3.1) but version Microsoft.CodeAnalysis.Common 4.13.0-3.24613.7 was resolved.

@mthalman maybe related to dotnet/dotnet#400 ?

@build-analysis build-analysis bot mentioned this pull request May 21, 2025
Open
3 tasks
@richlander richlander mentioned this pull request May 21, 2025
Open
dotnet-maestro bot and others added 5 commits May 22, 2025 02:03
@dotnet-maestro
Merging main into darc-main-85a65ee4-bc43-4d9a-9b5c-beffc2bf862a
2ae6e82
@dotnet-maestro
Update dependencies from https://github.com/dotnet/dotnet build 269082
11107f8 
Updated Dependencies:
dotnet-ef, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design (Version 10.0.0-preview.4.25269.109 -> 10.0.0-preview.4.25265.101)
Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Binder, Microsoft.Extensions.Configuration.CommandLine, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.FileExtensions, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration.UserSecrets, Microsoft.Extensions.Configuration.Xml, Microsoft.Extensions.Configuration, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Diagnostics.Abstractions, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Composite, Microsoft.Extensions.FileProviders.Physical, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Hosting, Microsoft.Extensions.Http, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Logging, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Options, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.DirectoryServices.Protocols, System.Formats.Asn1, System.IO.Pipelines, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Reflection.Metadata, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encodings.Web, System.Text.Json, System.Threading.AccessControl, System.Threading.Channels, System.Threading.RateLimiting, Microsoft.Extensions.DependencyModel, Microsoft.NETCore.App.Ref, Microsoft.NET.Runtime.MonoAOTCompiler.Task, Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, System.Collections.Immutable, System.Diagnostics.PerformanceCounter, System.IO.Hashing, System.Memory.Data, System.Numerics.Tensors, System.Runtime.Caching, Microsoft.NETCore.App.Runtime.win-x64, Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm, Microsoft.NETCore.BrowserDebugHost.Transport, System.Composition, Microsoft.NETCore.Platforms (Version 10.0.0-preview.5.25269.109 -> 10.0.0-preview.5.25265.101)
Microsoft.Web.Xdt (Version 10.0.0-preview.25269.109 -> 10.0.0-preview.25265.101)
Microsoft.DotNet.HotReload.Agent, Microsoft.DotNet.HotReload.Agent.Data (Version 10.0.100-preview.5.25269.109 -> 10.0.100-preview.5.25265.101)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk (Version 10.0.0-beta.25269.109 -> 10.0.0-beta.25265.101)
@akoeplinger
Add System.Threading.AccessControl to expected assemblies
1d3d3de 
It was added in dotnet/runtime#110416
@akoeplinger
Adjust expected exit code in ShutdownTests.cs
3c695d2 
This is a behavior change introduced by dotnet/runtime#115494
@akoeplinger
Fix method name, kill by default sends TERM not INT
1194316
@akoeplinger
Copy link
Member

akoeplinger commented May 22, 2025 •
edited
Loading

hmm @jkotas I adjusted the SIGTERM exit code test here like you did in the VMR to react to dotnet/runtime#115494 but it seems like we should actually get exit code 0 here since we override it?

aspnetcore/src/Hosting/Hosting/src/Internal/WebHostLifetime.cs

Lines 49 to 58 in c5d6996

private void ProcessExit(object? sender, EventArgs eventArgs)
{
Shutdown();
if (_exitedGracefully)
{
// On Linux if the shutdown is triggered by SIGTERM then that's signaled with the 143 exit code.
// Suppress that since we shut down gracefully. https://github.com/dotnet/aspnetcore/issues/6526
Environment.ExitCode = 0;
}
}

@akoeplinger
Copy link
Member

yeah given the latest test results we're not shutting down gracefully. I also don't see where aspnetcore registers a SIGTERM handler

@build-analysis build-analysis bot mentioned this pull request May 22, 2025
Open
3 tasks
@jkotas
Copy link
Member

jkotas commented May 22, 2025

I also don't see where aspnetcore registers a SIGTERM handler

It needs to register SIGTERM handler (and maybe replace CancelKeyPress with registration of SIGINT handler) to compensate for the breaking change.

Do you want me to push a fix?

@jkotas
Copy link
Member

jkotas commented May 22, 2025

(This code looks like a copy of https://github.com/dotnet/runtime/blob/main/src/libraries/Microsoft.Extensions.Hosting/src/Internal/ConsoleLifetime.netcoreapp.cs that diverged over time.)

@akoeplinger
Copy link
Member

akoeplinger commented May 22, 2025 •
edited
Loading

Do you want me to push a fix?

Yes please and revert 3c695d2. I thought this was already handled when I read dotnet/docs#46226 because it said

No action is necessary for typical ASP.NET applications or applications that use higher level APIs such as HostingHostBuilderExtensions.UseConsoleLifetime to handle app-model specific concerns. These higher-level APIs register handlers for SIGTERM and other signals as appropriate.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotnet-policy-service dotnet-policy-service[bot] dotnet-policy-service[bot] approved these changes

@halter73 halter73 Awaiting requested review from halter73 halter73 is a code owner

@BrennanConroy BrennanConroy Awaiting requested review from BrennanConroy BrennanConroy is a code owner

@JamesNK JamesNK Awaiting requested review from JamesNK JamesNK is a code owner

@mgravell mgravell Awaiting requested review from mgravell mgravell is a code owner

@wtgodbe wtgodbe Awaiting requested review from wtgodbe wtgodbe is a code owner

Assignees
No one assigned
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lewing @akoeplinger @jkotas @mthalman