Skip to content

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.3xx'#54052

Open
github-actions[bot] wants to merge 28 commits intorelease/10.0.3xxfrom
merge/release/10.0.1xx-to-release/10.0.3xx
Open

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.3xx'#54052
github-actions[bot] wants to merge 28 commits intorelease/10.0.3xxfrom
merge/release/10.0.1xx-to-release/10.0.3xx

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

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

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

  • marcpopMSFT
  • DonnaChen888
  • github-actions[bot]
  • dsplaisted
  • dotnet-maestro[bot]
  • Copilot
  • MiYanni
  • ellahathaway

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

# 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.1xx-to-release/10.0.3xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.3xx

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.1xx-to-release/10.0.3xx'. 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.1xx-to-release/10.0.3xx origin/release/10.0.3xx
git pull https://github.com/dotnet/sdk merge/release/10.0.1xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.3xx
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.1xx-to-release/10.0.3xx origin/release/10.0.3xx
git pull git@github.com:dotnet/sdk merge/release/10.0.1xx-to-release/10.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/10.0.1xx-to-release/10.0.3xx

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.

Copilot AI and others added 28 commits April 10, 2026 11:28
Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com>
Removed commented-out NuGet Audit configuration.
Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com>
Removed commented-out NuGet Audit configuration.
…nals build 20260416.1

On relative base path root
Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.26207.1 -> To Version 8.0.0-alpha.1.26216.1
…0260417.1

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 9.0.117-servicing.26215.7 -> To Version 9.0.117-servicing.26217.1
Microsoft.TemplateEngine.Abstractions From Version 9.0.117 -> To Version 9.0.117
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…net10.0

Separate the VS retargeting list (SupportedNETCoreAppTargetFramework) from
the list used for compiler define generation (_NETCoreAppVersionsForDefines).
_NETCoreAppVersionsForDefines always includes net10.0 unconditionally, so
NET10_0_OR_GREATER is emitted correctly regardless of MSBuild/VS version.
SupportedNETCoreAppTargetFramework continues to gate net10.0 behind
MSBuild 18.0.0 for the VS retargeting dropdown.

Agent-Logs-Url: https://github.com/dotnet/sdk/sessions/0bd2179c-396d-49c9-85fa-16860f6daff4

Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com>
…0260416.5

On relative base path root
Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.421-servicing.26215.5 -> To Version 8.0.421-servicing.26216.5
Microsoft.TemplateEngine.Abstractions From Version 8.0.421 -> To Version 8.0.421
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
Extend It_implicitly_defines_compilation_constants_for_the_target_framework
with a net10.0 InlineData to verify that NET10_0_OR_GREATER and all
preceding NET*_OR_GREATER defines are correctly emitted. This is a
unit-level MSBuild target test (AddImplicitDefineConstants) that does
not depend on MSBuild/VS version, so it covers the regression without
needing an E2E test against an older toolchain.

Agent-Logs-Url: https://github.com/dotnet/sdk/sessions/ba135360-e74d-449a-bd86-ac07db2c937e

Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com>
…420.3

On relative base path root
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.26201.6 -> To Version 9.0.0-beta.26220.3
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
… merge/release/9.0.3xx-to-release/10.0.1xx
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
@DonnaChen888
Copy link
Copy Markdown
Contributor

@dsplaisted could you please help take a look at this issue?

MauiHotReloadTests is failing at dotnet workload install maui --include-previews.
Error:

  • Version 9.0.16 of package microsoft.net.runtime.monoaotcompiler.task is not found in NuGet feeds
  • Version 9.0.16 of package microsoft.netcore.app.runtime.aot.win-x64.cross.android-arm64 is not found in NuGet feeds

It looks like the workload is resolving to version 9.0.16, but those packages are not available in feeds.

This seems related to the recent VersionFeature bump in this PR: 49e3b56

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.

6 participants