Skip to content

Conversation

@github-actions
Copy link
Contributor

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:

  • ViktorHofer

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.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/sourcelink HEAD:merge/release/10.0.2xx-to-main
or if you are using SSH
git push [email protected]:dotnet/sourcelink 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/sourcelink merge/release/10.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sourcelink 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/sourcelink merge/release/10.0.2xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sourcelink 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.

ViktorHofer and others added 4 commits November 24, 2025 10:50
The OneLocBuild by default should only run on the main branch. If release branches need different localization, a separate package id needs to be created.
* Update dependencies from https://github.com/dotnet/dotnet build 292085
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25570.103 -> 10.0.0-beta.25574.102)
System.CommandLine (Version 2.0.2 -> 2.0.2)

* Update Version.Details.props

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <[email protected]>
and make Microsoft.Build* a truly static dependency for SB and MSFT build.
ViktorHofer and others added 3 commits November 25, 2025 18:16
)

* Condition OneLocBuild to only run for the main branch (#1536)

The OneLocBuild by default should only run on the main branch. If release branches need different localization, a separate package id needs to be created.

* [release/10.0.1xx] Source code updates from dotnet/dotnet (#1541)

* Update dependencies from https://github.com/dotnet/dotnet build 292085
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25570.103 -> 10.0.0-beta.25574.102)
System.CommandLine (Version 2.0.2 -> 2.0.2)

* Update Version.Details.props

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <[email protected]>

* make Microsoft.Build* a truly static dependency for SB and MSFT build (#1544)

---------

Co-authored-by: Viktor Hofer <[email protected]>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@ViktorHofer ViktorHofer disabled auto-merge November 25, 2025 17:18
@ViktorHofer ViktorHofer merged commit c84e22b into main Nov 25, 2025
9 checks passed
@ViktorHofer ViktorHofer deleted the merge/release/10.0.2xx-to-main branch November 25, 2025 18:32
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