Skip to content

[automated] Merge branch 'release/10.0.4xx' => 'main'#54500

Open
github-actions[bot] wants to merge 10 commits into
mainfrom
merge/release/10.0.4xx-to-main
Open

[automated] Merge branch 'release/10.0.4xx' => 'main'#54500
github-actions[bot] wants to merge 10 commits into
mainfrom
merge/release/10.0.4xx-to-main

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

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

  • jjonescz
  • marcpopMSFT
  • Evangelink
  • Copilot

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

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

Copilot AI and others added 9 commits May 20, 2026 22:11
Agent-Logs-Url: https://github.com/dotnet/sdk/sessions/27b803cc-133f-4af1-ab61-72f538241b6f

Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com>
Environment variables specified via --environment (-e) on the command
line were only applied when a launch profile was present. If no launch
profile existed (or --no-launch-profile was used), the variables were
silently ignored.

Move the command-line env var loop outside of the launch profile block,
matching the behavior of 'dotnet run' which always applies command-line
env vars regardless of launch profile presence. The command-line vars
still override launch profile vars when both are present.
Co-authored-by: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com>
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
@github-actions github-actions Bot requested review from a team and tmat as code owners May 29, 2026 08:51
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.

5 participants