[automated] Merge branch 'release/10.0.2xx' => 'main' #51647

github-actions · 2025-11-11T14:24:12Z

I detected changes in the release/10.0.2xx 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/10.0.2xx by the following committers:

nagilson
jjonescz
DonnaChen888
tmat
ericstj
dotnet-maestro[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.

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/10.0.2xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/10.0.2xx

# 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/sdk HEAD:merge/release/10.0.2xx-to-main

or if you are using SSH

git push [email protected]:dotnet/sdk HEAD:merge/release/10.0.2xx-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/10.0.2xx-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/10.0.2xx-to-main origin/main
git pull https://github.com/dotnet/sdk merge/release/10.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.2xx-to-main

or if you are using SSH

git fetch
git checkout -b merge/release/10.0.2xx-to-main origin/main
git pull [email protected]:dotnet/sdk merge/release/10.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sdk HEAD:merge/release/10.0.2xx-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.

…251104.7 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.25553.3 -> To Version 2.1.0-preview.25554.7 MSTest From Version 4.1.0-preview.25553.3 -> To Version 4.1.0-preview.25554.7

…c28-4eaf-adba-4031b4acc786

[[ commit created by automation ]]

…9c5d-555f720457d0

Updated Dependencies: Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25502.107 -> 10.0.0-preview.25556.109) Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.0.0-preview-25502-107 -> 18.1.0-preview-25556-109) Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.0.0-rc.307 -> 7.0.0-preview.2.5709) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.0.0-2.25502.107 -> 5.3.0-1.25556.109) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25522.2 -> 10.0.0-beta.25556.109) Microsoft.FSharp.Compiler (Version 14.0.100-rc2.25502.107 -> 15.0.200-servicing.25556.109) Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-rc.2.25502.107 -> 10.0.100-rc.2.25556.109) Added Dependencies: Microsoft.CodeAnalysis.ExternalAccess.HotReload (Version 5.3.0-1.25556.109)

…VisitQualifiedName

…23e-4fdd-9c5d-555f720457d0

…251107.4 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.25553.3 -> To Version 2.1.0-preview.25557.4 MSTest From Version 4.1.0-preview.25553.3 -> To Version 4.1.0-preview.25557.4

…251108.6 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.25553.3 -> To Version 2.1.0-preview.25558.6 MSTest From Version 4.1.0-preview.25553.3 -> To Version 4.1.0-preview.25558.6

…251109.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.25553.3 -> To Version 2.1.0-preview.25559.1 MSTest From Version 4.1.0-preview.25553.3 -> To Version 4.1.0-preview.25559.1

…23e-4fdd-9c5d-555f720457d0

…c28-4eaf-adba-4031b4acc786

…23e-4fdd-9c5d-555f720457d0

…c28-4eaf-adba-4031b4acc786

Needed due to #51192.

…c28-4eaf-adba-4031b4acc786

…251111.13 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.25553.3 -> To Version 2.1.0-preview.25561.13 MSTest From Version 4.1.0-preview.25553.3 -> To Version 4.1.0-preview.25561.13

…se/10.0.2xx-to-main

DonnaChen888 · 2025-11-12T09:35:12Z

@marcpopMSFT @MiYanni could you please help me to take a look at this issue?

##[error]test\dotnet-watch.Tests\dotnet-watch.Tests.csproj(0,0): error NU1103: (NETCORE_ENGINEERING_TELEMETRY=Restore) Unable to find a stable package Microsoft.CodeAnalysis.ExternalAccess.HotReload with version

Found 230 version(s) in dotnet-tools [ Nearest version: 5.3.0-2.25561.8 ]

marcpopMSFT · 2025-11-12T23:34:53Z

@tmat @dbreshears I don't see Microsoft.CodeAnalysis.ExternalAccess.HotReload up on nuget. Was that supposed to get published with net10 or are we missing a feed?

dsplaisted · 2025-11-13T00:13:58Z

I think this may be a bad merge. MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion is never set so the PackageVersion version for PackageVersion version for Microsoft.CodeAnalysis.ExternalAccess.HotReload is empty.

When we merge between branches mostly don't take changes in Versions..Details.props or Versions.Details.xml, those are updated via dependency flow.

@DonnaChen888 Can you try re-merging or fixing the merge?

tmat · 2025-11-13T01:28:48Z

When we merge between branches mostly don't take changes in Versions..Details.props or Versions.Details.xml, those are updated via dependency flow.

If a new dependency is added the build would fail without these files updated, no?

tmat · 2025-11-13T01:29:52Z

@tmat @dbreshears I don't see Microsoft.CodeAnalysis.ExternalAccess.HotReload up on nuget. Was that supposed to get published with net10 or are we missing a feed?

Its on dotnet-tools feed: https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-tools/NuGet/Microsoft.CodeAnalysis.ExternalAccess.HotReload/overview/5.3.0-2.25562.11

DonnaChen888 · 2025-11-13T09:41:28Z

Closing and retriggering the subscription.

dsplaisted · 2025-11-13T17:02:17Z

Updated PR: #51720

dotnet-maestro bot and others added 21 commits November 5, 2025 02:04

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-97438f3c-b…

03f6d6e

…c28-4eaf-adba-4031b4acc786

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-97438f3c-b…

413d99b

…c28-4eaf-adba-4031b4acc786

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-97438f3c-b…

5c8f7cb

…c28-4eaf-adba-4031b4acc786

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-97438f3c-b…

cccffbb

…c28-4eaf-adba-4031b4acc786

Backflow from https://github.com/dotnet/dotnet / 6f4c060 build 289866

00c5249

[[ commit created by automation ]]

Merge release/10.0.2xx into darc-release/10.0.2xx-64b0aa88-723e-4fdd-…

5a6177c

…9c5d-555f720457d0

Delete duplicate tests

dcc8cfe

Update baseline

11ededf

Make GlobalPrefixRemover override VisitAliasQualifiedName instead of …

6a04a91

…VisitQualifiedName

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-64b0aa88-7…

93ce3b4

…23e-4fdd-9c5d-555f720457d0

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-64b0aa88-7…

9827b5f

…23e-4fdd-9c5d-555f720457d0

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-97438f3c-b…

41f38b8

…c28-4eaf-adba-4031b4acc786

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-64b0aa88-7…

73af02e

…23e-4fdd-9c5d-555f720457d0

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-97438f3c-b…

e5d688d

…c28-4eaf-adba-4031b4acc786

Fix failing build task tests

d91154f

Needed due to #51192.

[release/10.0.2xx] Source code updates from dotnet/dotnet (#51612)

265a139

github-actions bot requested review from a team as code owners November 11, 2025 14:24

Youssef1313 and others added 7 commits November 11, 2025 23:42

Suppress

599261f

Suppress

f0c7627

Suppress

52f47bf

Suppress

ec46acd

Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-97438f3c-b…

444d7d2

…c28-4eaf-adba-4031b4acc786

[release/10.0.2xx] Update dependencies from microsoft/testfx (#51567)

ee432c9

Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…

d520857

…se/10.0.2xx-to-main

Youssef1313 mentioned this pull request Nov 13, 2025

[main] Update dependencies from microsoft/testfx #51565

Open

DonnaChen888 force-pushed the merge/release/10.0.2xx-to-main branch from ccb328e to d520857 Compare November 13, 2025 09:12

Merge branch 'main' into merge/release/10.0.2xx-to-main

c6e983e

DonnaChen888 closed this Nov 13, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'release/10.0.2xx' => 'main' #51647

[automated] Merge branch 'release/10.0.2xx' => 'main' #51647

Uh oh!

github-actions bot commented Nov 11, 2025

Uh oh!

DonnaChen888 commented Nov 12, 2025

Uh oh!

marcpopMSFT commented Nov 12, 2025

Uh oh!

dsplaisted commented Nov 13, 2025

Uh oh!

tmat commented Nov 13, 2025

Uh oh!

tmat commented Nov 13, 2025

Uh oh!

DonnaChen888 commented Nov 13, 2025

Uh oh!

dsplaisted commented Nov 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

[automated] Merge branch 'release/10.0.2xx' => 'main' #51647

[automated] Merge branch 'release/10.0.2xx' => 'main' #51647

Uh oh!

Conversation

github-actions bot commented Nov 11, 2025

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

DonnaChen888 commented Nov 12, 2025

Uh oh!

marcpopMSFT commented Nov 12, 2025

Uh oh!

dsplaisted commented Nov 13, 2025

Uh oh!

tmat commented Nov 13, 2025

Uh oh!

tmat commented Nov 13, 2025

Uh oh!

DonnaChen888 commented Nov 13, 2025

Uh oh!

dsplaisted commented Nov 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants