Skip to content

[automated] Merge branch 'main' => 'release/dnup'#53868

Open
github-actions[bot] wants to merge 4 commits intorelease/dnupfrom
merge/main-to-release/dnup
Open

[automated] Merge branch 'main' => 'release/dnup'#53868
github-actions[bot] wants to merge 4 commits intorelease/dnupfrom
merge/main-to-release/dnup

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

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

This PR merges commits made on main by the following committers:

  • ViktorHofer
  • krwq
  • MichaelSimons
  • MiYanni
  • JeremyKuhne
  • akoeplinger
  • Copilot
  • marcpopMSFT
  • DonnaChen888
  • dotnet-maestro[bot]
  • slang25
  • YuliiaKovalova
  • javiercn
  • mmitche
  • SimonZhao888
  • lewing
  • Evangelink
  • baronfel
  • nagilson
  • NikolaMilosavljevic
  • ellahathaway
  • SimaTian
  • github-actions[bot]
  • dotnet-bot
  • kotlarmilos
  • jonathanpeppers
  • tmat
  • Youssef1313
  • akhera99
  • jjonescz
  • elinor-fung
  • Nigusu-Allehu
  • kasperk81
  • martinrrm
  • davidwengier
  • vseanreesermsft
  • invalid-email-address
  • joeloff
  • am11
  • JoeRobich
  • manfred-brands
  • dsplaisted
  • adamzip
  • dotnet-sb-bot
  • mthalman
  • drewnoakes
  • adamsitnik
  • karl-sjogren
  • nohwnd
  • Forgind
  • MichielOda
  • andychiare
  • ToddGrun
  • SimonCropp
  • ewilliams0305
  • david-acm
  • egvijayanand
  • smitpatel
  • omahs
  • PaulBraetz
  • v-wuzhai
  • vlada-shubina
  • GangWang01
  • maridematte
  • CliffordSimak
  • zhanknight
  • JanKrivanek
  • dependabot[bot]
  • levimatheri
  • lbussell
  • knollsen
  • DavidKarlas
  • danielchalmers
  • ladipro
  • bekir-ozturk
  • cloudRoutine
  • vzarytovskii
  • dsyme
  • AR-May
  • jmarolf
  • bozturkMSFT
  • jonms90
  • peaceful-djony
  • Hammerstad
  • jwosty
  • genalt
  • donJoseLuis
  • phenning
  • brianrob
  • vijayrkn
  • Eilon
  • seancpeters
  • cartermp
  • mlorbetske
  • alexperovich
  • jayaranigarg
  • scottaddie
  • bradwilson
  • sayedihashimi
  • danroth27
  • DamianEdwards
  • KevinRansom
  • davidfowl
  • HaoK
  • glennc
  • prafullbhosale
  • livarcocc

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

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

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

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.

ViktorHofer and others added 2 commits April 14, 2026 13:58
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
- CODEOWNERS
@MiYanni MiYanni added the Blocked Issue is blocked on an external dependency label Apr 16, 2026
dsplaisted and others added 2 commits April 28, 2026 16:36
Resolved conflicts in eng/common files (Versions.props, post-build.yml,
install-dependencies.sh) taking the main branch versions which match
upstream Arcade.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The merge from main dropped OpenTelemetryVersion and
AzureMonitorOpenTelemetryExporterPackageVersion which are needed
by dotnetup.csproj. Restore them from release/dnup.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Blocked Issue is blocked on an external dependency

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants