Skip to content

[automated] Merge branch 'release/11.0' => 'main' - #69010

Merged
wtgodbe merged 5 commits into
mainfrom
merge/release/11.0-to-main
Sep 3, 2026
Merged

[automated] Merge branch 'release/11.0' => 'main'#69010
wtgodbe merged 5 commits into
mainfrom
merge/release/11.0-to-main

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

I detected changes in the release/11.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/11.0 by the following committers:

  • github-actions[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/11.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/11.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/aspnetcore HEAD:merge/release/11.0-to-main
or if you are using SSH
git push git@github.com:dotnet/aspnetcore HEAD:merge/release/11.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/11.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/11.0-to-main origin/main
git pull https://github.com/dotnet/aspnetcore merge/release/11.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/aspnetcore HEAD:merge/release/11.0-to-main
or if you are using SSH
git fetch
git checkout -b merge/release/11.0-to-main origin/main
git pull git@github.com:dotnet/aspnetcore merge/release/11.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/aspnetcore HEAD:merge/release/11.0-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

[release/11.0] Fix menu problem in templates
@github-actions
github-actions Bot requested a review from a team as a code owner September 2, 2026 22:35
* Update dependencies from build 329542
Updated Dependencies:
Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, 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.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-rc.2.26429.111 -> 11.0.0-rc.2.26431.104)
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 (Version 11.0.0-beta.26429.111 -> 11.0.0-beta.26431.104)
Microsoft.Web.Xdt (Version 3.3.0-rc.2.26429.111 -> 3.3.0-rc.2.26431.104)
NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.11.0-rc.43011 -> 7.11.0-rc.43204)
[[ commit created by automation ]]

* [release/11.0] Quarantine QuickGridInteractiveCompatTest.PaginatorCorrectItemsPerPage

Backport of #68682.

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

* [release/11.0] Quarantine VirtualizationTest.ScrollToItem_AfterEndJump_LandsAtTarget

Backport of #68681.

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

* [release/11.0] Quarantine ScrollToItem_UserScrollDuringProviderFetch_UserScrollWins

Backport of #68778.

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

* Quarantine flaky BlazorWebJsInitializersTest.InitializersRunsModernCallbacksByDefaultWhenPresent

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

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions
github-actions Bot requested review from a team and wtgodbe as code owners September 3, 2026 03:10
javiercn and others added 2 commits September 3, 2026 07:49
…#68948)

* [Blazor] Update Bootstrap to 5.3.8 in templates and Identity UI (#68898)

Refresh all vendored Bootstrap 5 assets, CDN integrity hashes, licenses, and package-test expectations. Extend the copy automation to cover the current Blazor template path, standalone WebAssembly, and Identity UI.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 95292c6a-5353-44bc-9065-d2fe86d53e90

* Use Bootstrap 5 fallback test class

Use visually-hidden for the Bootstrap 5 CDN fallback probe so a successful CDN load does not trigger the local stylesheet fallback.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 83dcfc7b-0305-4d3a-abe0-0d3bf535dddc

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 95292c6a-5353-44bc-9065-d2fe86d53e90
Copilot-Session: 83dcfc7b-0305-4d3a-abe0-0d3bf535dddc
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@wtgodbe
wtgodbe merged commit ee8db9e into main Sep 3, 2026
27 checks passed
@wtgodbe
wtgodbe deleted the merge/release/11.0-to-main branch September 3, 2026 18:58
@dotnet-milestone-bot dotnet-milestone-bot Bot added this to the 12.0-preview1 milestone Sep 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants