Skip to content

[main] Source code updates from dotnet/dotnet - #69553

Merged
dotnet-maestro[bot] merged 11 commits into
mainfrom
darc-main-593d34c8-d256-40e7-9908-727139b7b3ee
Sep 30, 2026
Merged

[main] Source code updates from dotnet/dotnet#69553
dotnet-maestro[bot] merged 11 commits into
mainfrom
darc-main-593d34c8-d256-40e7-9908-727139b7b3ee

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Sep 26, 2026

Copy link
Copy Markdown
Contributor

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

  • From 11.0.0-rc.1.26453.108 to 12.0.0-alpha.1.26473.114
    • dotnet-ef
    • Microsoft.Bcl.AsyncInterfaces
    • Microsoft.Bcl.Cryptography
    • 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.26453.108 to 12.0.0-beta.26473.114
    • Microsoft.DotNet.Arcade.Sdk
    • Microsoft.DotNet.Build.Tasks.Archives
    • Microsoft.DotNet.Build.Tasks.Installers
    • Microsoft.DotNet.Build.Tasks.Templating
    • Microsoft.DotNet.Helix.JobMonitor
    • Microsoft.DotNet.Helix.Sdk
    • Microsoft.DotNet.RemoteExecutor
    • Microsoft.DotNet.SharedFramework.Sdk
  • From 3.3.0-rc.1.26453.108 to 12.0.0-alpha.1.26473.114
    • Microsoft.Web.Xdt
  • From 7.12.0-rc.45408 to 8.0.0-rc.47514
    • 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:c567e8ff13b8ada7c5285c60bc2ac1111ae602e7..https://github.com/dotnet/aspnetcore:darc-main-593d34c8-d256-40e7-9908-727139b7b3ee

@dotnet-maestro

dotnet-maestro Bot commented Sep 26, 2026

Copy link
Copy Markdown
Contributor Author

Caution

🚨 Action Required — Conflict detected

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

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.26451.2 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 333699 with sources from c567e8f

  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.

@dotnet-maestro

dotnet-maestro Bot commented Sep 26, 2026

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

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

@dotnet-policy-service dotnet-policy-service Bot added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼 labels Sep 26, 2026
dotnet-policy-service[bot]
dotnet-policy-service Bot approved these changes Sep 26, 2026
View reviewed changes

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

Copy link
Copy Markdown
Contributor

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

dotnet-maestro Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running: 
    darc trigger-subscriptions --id 227fbda2-94d8-406e-91e6-26cb20b6628c
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted. 
    darc trigger-subscriptions --id 227fbda2-94d8-406e-91e6-26cb20b6628c --force

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

@wtgodbe
Merge remote-tracking branch 'upstream/main' into darc-main-593d34c8-…
6f8dde2 
…d256-40e7-9908-727139b7b3ee

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@dotnet-maestro

dotnet-maestro Bot commented Sep 29, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running: 
    darc trigger-subscriptions --id 227fbda2-94d8-406e-91e6-26cb20b6628c
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted. 
    darc trigger-subscriptions --id 227fbda2-94d8-406e-91e6-26cb20b6628c --force

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

@wtgodbe
Restore bootstrap-compatible shared-framework assembly version pin
e3ac2a1 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@wtgodbe wtgodbe mentioned this pull request Sep 29, 2026
Open
wtgodbe and others added 2 commits September 29, 2026 11:40
@wtgodbe
Include nonshipping template packages in test workflows
679ec62 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@wtgodbe
Skip framework assertions during the .NET 12 bootstrap transition
5667d91 
Track re-enabling these tests and removing the assembly pin in #69595.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
wtgodbe and others added 4 commits September 29, 2026 15:40
@wtgodbe
Use IParsable for URI parameter binding
5612269 
Remove the redundant Uri.TryCreate special case and its obsolete method-shape test.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@wtgodbe
Anchor template test paths to the project directory
d33db5f 
Keep generated template imports in the documented output directory when MSBuild runs in multi-threaded mode.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@wtgodbe
Prepare WebView package prerequisites before tests
38418b5 
Build and pack the required project graph into an isolated test feed before test execution. Include the package-only analyzer dependency and remove the package polling workaround without changing CI pipeline ordering.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@wtgodbe
Merge branch 'main' into darc-main-593d34c8-d256-40e7-9908-727139b7b3ee
3686fde
@build-analysis build-analysis Bot mentioned this pull request Sep 30, 2026
Open
3 tasks
@wtgodbe
Check frame type before accessing component in renderer test
395cfd0 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@dotnet-maestro

dotnet-maestro Bot commented Sep 30, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running: 
    darc trigger-subscriptions --id 227fbda2-94d8-406e-91e6-26cb20b6628c
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted. 
    darc trigger-subscriptions --id 227fbda2-94d8-406e-91e6-26cb20b6628c --force

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

@dotnet-maestro
dotnet-maestro Bot merged commit 92b29c3 into main Sep 30, 2026
34 checks passed
@dotnet-maestro
dotnet-maestro Bot deleted the darc-main-593d34c8-d256-40e7-9908-727139b7b3ee branch September 30, 2026 06:26
@wtgodbe wtgodbe mentioned this pull request Oct 1, 2026
Merged
4 tasks done
@dotnet-maestro dotnet-maestro Bot mentioned this pull request Oct 2, 2026
Merged
@dotnet-milestone-bot dotnet-milestone-bot Bot added this to the 12.0-preview1 milestone Oct 2, 2026
@DeagleGross DeagleGross mentioned this pull request Oct 5, 2026
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BrennanConroy BrennanConroy BrennanConroy approved these changes
@dotnet-policy-service dotnet-policy-service[bot] dotnet-policy-service[bot] approved these changes
@tdykstra tdykstra Awaiting requested review from tdykstra
@halter73 halter73 Awaiting requested review from halter73 halter73 is a code owner
@SamMonoRT SamMonoRT Awaiting requested review from SamMonoRT SamMonoRT is a code owner
@Youssef1313 Youssef1313 Awaiting requested review from Youssef1313 Youssef1313 is a code owner
@cincuranet cincuranet Awaiting requested review from cincuranet cincuranet is a code owner
@rokonec rokonec Awaiting requested review from rokonec rokonec is a code owner
@davpetr davpetr Awaiting requested review from davpetr davpetr 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 build-ops Type: Dependency Update 🔼

Projects

None yet

Milestone

12.0-preview1

Development

Successfully merging this pull request may close these issues.

2 participants

@BrennanConroy @wtgodbe