Skip to content

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

Merged
dotnet-maestro[bot] merged 5 commits intomainfrom
darc-main-add31982-129f-4022-a49d-c5de6e62aeac
Apr 27, 2026
Merged

[main] Source code updates from dotnet/dotnet#66451
dotnet-maestro[bot] merged 5 commits intomainfrom
darc-main-add31982-129f-4022-a49d-c5de6e62aeac

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented Apr 24, 2026 •
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

New Dependencies

  • Added 10.4.1
    • Microsoft.Extensions.ServiceDiscovery
    • Microsoft.Extensions.ServiceDiscovery.Yarp

Updated Dependencies

  • From 11.0.0-preview.4.26215.121 to 11.0.0-preview.5.26224.123
    • dotnet-ef
    • Microsoft.Bcl.AsyncInterfaces
    • Microsoft.Bcl.TimeProvider
    • Microsoft.EntityFrameworkCore
    • Microsoft.EntityFrameworkCore.Design
    • Microsoft.EntityFrameworkCore.InMemory
    • Microsoft.EntityFrameworkCore.Relational
    • Microsoft.EntityFrameworkCore.Sqlite
    • Microsoft.EntityFrameworkCore.SqlServer
    • Microsoft.EntityFrameworkCore.Tools
    • Microsoft.Extensions.Caching.Abstractions
    • Microsoft.Extensions.Caching.Memory
    • Microsoft.Extensions.Configuration
    • 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.DependencyInjection
    • Microsoft.Extensions.DependencyInjection.Abstractions
    • Microsoft.Extensions.DependencyModel
    • 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
    • Microsoft.Extensions.Hosting.Abstractions
    • Microsoft.Extensions.Http
    • Microsoft.Extensions.Logging
    • Microsoft.Extensions.Logging.Abstractions
    • Microsoft.Extensions.Logging.Configuration
    • Microsoft.Extensions.Logging.Console
    • Microsoft.Extensions.Logging.Debug
    • Microsoft.Extensions.Logging.EventLog
    • Microsoft.Extensions.Logging.EventSource
    • Microsoft.Extensions.Logging.TraceSource
    • Microsoft.Extensions.Options
    • Microsoft.Extensions.Options.ConfigurationExtensions
    • Microsoft.Extensions.Options.DataAnnotations
    • Microsoft.Extensions.Primitives
    • Microsoft.Internal.Runtime.AspNetCore.Transport
    • Microsoft.NET.Runtime.MonoAOTCompiler.Task
    • Microsoft.NET.Runtime.WebAssembly.Sdk
    • Microsoft.NETCore.App.Ref
    • Microsoft.NETCore.BrowserDebugHost.Transport
    • Microsoft.NETCore.Platforms
    • System.Collections.Immutable
    • System.Composition
    • System.Configuration.ConfigurationManager
    • System.Diagnostics.DiagnosticSource
    • System.Diagnostics.EventLog
    • System.Diagnostics.PerformanceCounter
    • System.DirectoryServices.Protocols
    • System.Formats.Asn1
    • System.Formats.Cbor
    • System.IO.Hashing
    • System.IO.Pipelines
    • System.Memory.Data
    • System.Net.Http.Json
    • System.Net.Http.WinHttpHandler
    • System.Net.ServerSentEvents
    • System.Numerics.Tensors
    • System.Reflection.Metadata
    • System.Resources.Extensions
    • System.Runtime.Caching
    • 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
  • From 11.0.0-beta.26215.121 to 11.0.0-beta.26224.123
    • 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
  • From 3.3.0-preview.4.26215.121 to 3.3.0-preview.5.26224.123
    • Microsoft.Web.Xdt
  • From 7.7.0-rc.21621 to 7.7.0-rc.22523
    • NuGet.Frameworks
    • NuGet.Packaging
    • NuGet.Versioning

Associated changes in source repos

Diff the source with this PR branch 
darc vmr diff --name-only https://github.com/dotnet/dotnet:472c68a4fb23be92717d1714fb7a38bda7c4aac0..https://github.com/dotnet/aspnetcore:darc-main-add31982-129f-4022-a49d-c5de6e62aeac

@dotnet-maestro
Update dependencies from build 311575
383d2df 
Updated Dependencies:
Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, dotnet-ef, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, 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.DependencyInjection, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, 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, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Http, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Options, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Collections.Immutable, System.Composition, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Diagnostics.PerformanceCounter, System.DirectoryServices.Protocols, System.Formats.Asn1, System.Formats.Cbor, System.IO.Hashing, System.IO.Pipelines, System.Memory.Data, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Numerics.Tensors, System.Reflection.Metadata, System.Resources.Extensions, System.Runtime.Caching, 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 (Version 11.0.0-preview.4.26215.121 -> 11.0.0-preview.4.26222.142)
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 11.0.0-beta.26215.121 -> 11.0.0-beta.26222.142)
Microsoft.Web.Xdt (Version 3.3.0-preview.4.26215.121 -> 3.3.0-preview.4.26222.142)
NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.7.0-rc.21621 -> 7.7.0-rc.22342)

Added Dependencies:
Microsoft.Extensions.ServiceDiscovery, Microsoft.Extensions.ServiceDiscovery.Yarp (Version 10.4.1)
[[ commit created by automation ]]
@dotnet-maestro dotnet-maestro Bot requested review from a team and wtgodbe as code owners April 24, 2026 02:02
@github-actions github-actions Bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Apr 24, 2026
dotnet-policy-service[bot]
dotnet-policy-service Bot approved these changes Apr 24, 2026
View reviewed changes
Copy link
Copy Markdown
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.

@dotnet-maestro
Update dependencies from build 311807
7155025 
Updated Dependencies:
Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, dotnet-ef, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, 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.DependencyInjection, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, 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, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Http, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Options, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Collections.Immutable, System.Composition, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Diagnostics.PerformanceCounter, System.DirectoryServices.Protocols, System.Formats.Asn1, System.Formats.Cbor, System.IO.Hashing, System.IO.Pipelines, System.Memory.Data, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Numerics.Tensors, System.Reflection.Metadata, System.Resources.Extensions, System.Runtime.Caching, 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 (Version 11.0.0-preview.4.26222.142 -> 11.0.0-preview.4.26224.104)
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 11.0.0-beta.26222.142 -> 11.0.0-beta.26224.104)
Microsoft.Web.Xdt (Version 3.3.0-preview.4.26222.142 -> 3.3.0-preview.4.26224.104)
NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.7.0-rc.22342 -> 7.7.0-rc.22504)
[[ commit created by automation ]]
@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented Apr 25, 2026

@copilot undo the changes related to Microsoft.Extensions.ServiceDiscovery and Microsoft.Extensions.ServiceDiscovery.Yarp versions (and SHAs) in Version.Details.xml and Version.Details.props

@wtgodbe
Revert Microsoft.Extensions.ServiceDiscovery and ServiceDiscovery.Yar…
09a9861 
…p version/SHA changes

Agent-Logs-Url: https://github.com/dotnet/aspnetcore/sessions/fe35daed-84fd-41cc-82f9-f197c584ec4c

Co-authored-by: wtgodbe <14283640+wtgodbe@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 25, 2026

@copilot undo the changes related to Microsoft.Extensions.ServiceDiscovery and Microsoft.Extensions.ServiceDiscovery.Yarp versions (and SHAs) in Version.Details.xml and Version.Details.props

Done in commit 09a9861a. Reverted Microsoft.Extensions.ServiceDiscovery and Microsoft.Extensions.ServiceDiscovery.Yarp versions back to 10.6.0-preview.1.26215.2 and SHAs back to 4a53db27b7b38fbdedd8f0bf530f2b140a436a2b in both eng/Version.Details.xml and eng/Version.Details.props.

@wtgodbe wtgodbe enabled auto-merge (squash) April 25, 2026 13:44
This was referenced Apr 25, 2026
Open
Open
Open
@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

dotnet-maestro Bot commented Apr 26, 2026

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 311854 of https://github.com/dotnet/dotnet/tree/472c68a4fb23be92717d1714fb7a38bda7c4aac0.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository 
    git clone https://github.com/dotnet/aspnetcore
cd aspnetcore
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26222.1 or higher) 
    # Linux / MacOS
./eng/common/darc-init.sh
# or on Windows
.\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally 
    darc vmr resolve-conflict --subscription 227fbda2-94d8-406e-91e6-26cb20b6628c
    This should apply the build 311854 with sources from 472c68a
  4. Resolve the conflicts, commit & push the changes
  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@wtgodbe
Update Negotiate test for HTTP/2 auth downgrade (dotnet/runtime#123827)
5bdd22d 
The runtime now automatically downgrades HTTP/2 to HTTP/1.1 when a
401 Negotiate/NTLM challenge is received. Update the test assertion
to expect HTTP/1.1 for the challenge response, matching the existing
pattern used by other auth tests in this file.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@wtgodbe wtgodbe requested a review from halter73 as a code owner April 27, 2026 01:14
@wtgodbe wtgodbe disabled auto-merge April 27, 2026 01:15
@dotnet-maestro dotnet-maestro Bot merged commit 8a68740 into main Apr 27, 2026
26 checks passed
@dotnet-maestro dotnet-maestro Bot deleted the darc-main-add31982-129f-4022-a49d-c5de6e62aeac branch April 27, 2026 02:52
@dotnet-policy-service dotnet-policy-service Bot added this to the 11.0-preview5 milestone Apr 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wtgodbe wtgodbe wtgodbe approved these changes

@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

Assignees

No one assigned

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework build-ops Type: Dependency Update 🔼

Projects

None yet

Milestone

11.0-preview5

Development

Successfully merging this pull request may close these issues.

2 participants

@wtgodbe