Skip to content

[automated] Merge branch 'release/10.0.3xx' => 'main'#10036

Merged
DonnaChen888 merged 5 commits intomainfrom
merge/release/10.0.3xx-to-main
Mar 24, 2026
Merged

[automated] Merge branch 'release/10.0.3xx' => 'main'#10036
DonnaChen888 merged 5 commits intomainfrom
merge/release/10.0.3xx-to-main

Conversation

@github-actions
Copy link
Copy Markdown

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

  • DonnaChen888
  • 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.

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

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

dotnet-maestro Bot and others added 2 commits March 24, 2026 01:08
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26167.115 -> 10.0.0-beta.26173.111)
[[ commit created by automation ]]
> [!NOTE]
> This is a codeflow update. It may contain both source code changes
from
> [the VMR](https://github.com/dotnet/dotnet)
> as well as dependency updates. Learn more
[here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md).

This pull request brings the following source code changes

[marker]: <> (Begin:bbf9aa7e-217b-4275-99d1-5f23eb747967)

## From https://github.com/dotnet/dotnet
- **Subscription**:
[bbf9aa7e-217b-4275-99d1-5f23eb747967](https://maestro.dot.net/subscriptions?search=bbf9aa7e-217b-4275-99d1-5f23eb747967)
- **Build**:
[20260323.11](https://dev.azure.com/dnceng/internal/_build/results?buildId=2933878)
([307407](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/307407))
- **Date Produced**: March 24, 2026 12:38:36 AM UTC
- **Commit**:
[4bf356979576e49df34287d2de49dcb600a6c0e6](dotnet/dotnet@4bf3569)
- **Commit Diff**:
[4a2e646...4bf3569](dotnet/dotnet@4a2e646...4bf3569)
- **Branch**:
[release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

**Updated Dependencies**
- From [10.0.0-beta.26167.115 to
10.0.0-beta.26173.111](dotnet/dotnet@4a2e646...4bf3569)
  - Microsoft.DotNet.Arcade.Sdk

[marker]: <> (End:bbf9aa7e-217b-4275-99d1-5f23eb747967)
[marker]: <> (Start:Footer:CodeFlow PR)

## Associated changes in source repos
-
dotnet/msbuild@8cee1da...5071b11
-
NuGet/NuGet.Client@1edb104...6840069
-
dotnet/razor@f64530d...15665b9
-
dotnet/roslyn@491aa49...c2a993b
-
dotnet/scenario-tests@368b998...cda54e3

<details>
<summary>Diff the source with this PR branch</summary>

```bash
darc vmr diff --name-only https://github.com/dotnet/dotnet:4bf356979576e49df34287d2de49dcb600a6c0e6..https://github.com/dotnet/templating:darc-release/10.0.3xx-38bfd40d-fe22-4f88-926f-0df88a400e8e
```
</details>

[marker]: <> (End:Footer:CodeFlow PR)
@github-actions github-actions Bot requested a review from a team as a code owner March 24, 2026 04:30
dotnet-maestro Bot and others added 3 commits March 24, 2026 05:00
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.26173.111 -> 10.0.0-beta.26173.118)
[[ commit created by automation ]]
> [!NOTE]
> This is a codeflow update. It may contain both source code changes
from
> [the VMR](https://github.com/dotnet/dotnet)
> as well as dependency updates. Learn more
[here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md).

This pull request brings the following source code changes

[marker]: <> (Begin:bbf9aa7e-217b-4275-99d1-5f23eb747967)

## From https://github.com/dotnet/dotnet
- **Subscription**:
[bbf9aa7e-217b-4275-99d1-5f23eb747967](https://maestro.dot.net/subscriptions?search=bbf9aa7e-217b-4275-99d1-5f23eb747967)
- **Build**:
[20260323.18](https://dev.azure.com/dnceng/internal/_build/results?buildId=2934189)
([307430](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/307430))
- **Date Produced**: March 24, 2026 4:33:53 AM UTC
- **Commit**:
[9a179e5ee8e823591b4cc7d9ffe734602cd06a94](dotnet/dotnet@9a179e5)
- **Commit Diff**:
[4bf3569...9a179e5](dotnet/dotnet@4bf3569...9a179e5)
- **Branch**:
[release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

**Updated Dependencies**
- From [10.0.0-beta.26173.111 to
10.0.0-beta.26173.118](dotnet/dotnet@4bf3569...9a179e5)
  - Microsoft.DotNet.Arcade.Sdk

[marker]: <> (End:bbf9aa7e-217b-4275-99d1-5f23eb747967)
[marker]: <> (Start:Footer:CodeFlow PR)

## Associated changes in source repos
-
dotnet/sdk@e0a6b80...f9305f8

<details>
<summary>Diff the source with this PR branch</summary>

```bash
darc vmr diff --name-only https://github.com/dotnet/dotnet:9a179e5ee8e823591b4cc7d9ffe734602cd06a94..https://github.com/dotnet/templating:darc-release/10.0.3xx-d03cfdf2-4aa0-4aa2-a76e-eb415bc32d1c
```
</details>

[marker]: <> (End:Footer:CodeFlow PR)
@DonnaChen888 DonnaChen888 merged commit 2995ec4 into main Mar 24, 2026
8 checks passed
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.

1 participant