Skip to content

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.4xx'#10110

Open
github-actions[bot] wants to merge 12 commits intorelease/8.0.4xxfrom
merge/release/8.0.1xx-to-release/8.0.4xx
Open

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.4xx'#10110
github-actions[bot] wants to merge 12 commits intorelease/8.0.4xxfrom
merge/release/8.0.1xx-to-release/8.0.4xx

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Apr 8, 2026

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

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

  • DonnaChen888
  • vseanreesermsft

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/8.0.1xx
git pull --ff-only
git checkout release/8.0.4xx
git pull --ff-only
git merge --no-ff release/8.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/templating HEAD:merge/release/8.0.1xx-to-release/8.0.4xx
or if you are using SSH
git push git@github.com:dotnet/templating HEAD:merge/release/8.0.1xx-to-release/8.0.4xx

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

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 4 commits March 19, 2026 02:02
…318.3

On relative base path root
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.26152.2 -> To Version 8.0.0-beta.26168.3
…ence-packages build 20260403.3

On relative base path root
Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.26152.2 -> To Version 8.0.0-alpha.1.26203.3
This PR updates version branding on branch `release/8.0.1xx`.

**Changes:**
- Repository: templating
  - PatchVersion: `26` → `27`

**Files Modified:**
- eng/Versions.props (+1 -1)
@github-actions github-actions bot requested review from a team and GangWang01 as code owners April 8, 2026 01:41
This pull request updates the following dependencies

[marker]: <> (Begin:0d66de4b-fd8f-44dd-a789-08db9e4038dc)
## From https://github.com/dotnet/arcade
- **Subscription**:
[0d66de4b-fd8f-44dd-a789-08db9e4038dc](https://maestro.dot.net/subscriptions?search=0d66de4b-fd8f-44dd-a789-08db9e4038dc)
- **Build**:
[20260318.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2929987)
([306827](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/306827))
- **Date Produced**: March 18, 2026 9:14:18 PM UTC
- **Commit**:
[8dabb7110e0c0e8ca9866f389493bfb5047b8c24](dotnet/arcade@8dabb71)
- **Branch**:
[release/8.0](https://github.com/dotnet/arcade/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [8.0.0-beta.26152.2 to 8.0.0-beta.26168.3][1]
     - Microsoft.DotNet.Arcade.Sdk

[1]: dotnet/arcade@ff8437c...8dabb71

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates **tools.dotnet** to 8.0.125

[marker]: <> (End:0d66de4b-fd8f-44dd-a789-08db9e4038dc)
…nce-packages (#10103)

This pull request updates the following dependencies

[marker]: <> (Begin:c3d369e0-9275-4689-0eb0-08db9e40a4f0)
## From https://github.com/dotnet/source-build-reference-packages
- **Subscription**:
[c3d369e0-9275-4689-0eb0-08db9e40a4f0](https://maestro.dot.net/subscriptions?search=c3d369e0-9275-4689-0eb0-08db9e40a4f0)
- **Build**:
[20260403.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2943179)
([309143](https://maestro.dot.net/channel/3885/github:dotnet:source-build-reference-packages/build/309143))
- **Date Produced**: April 3, 2026 5:47:45 PM UTC
- **Commit**:
[9d83c59ff890ff2020aa38ebcf3bb514e38e9ffe](dotnet/source-build-assets@9d83c59)
- **Branch**:
[release/8.0](https://github.com/dotnet/source-build-reference-packages/tree/release/8.0)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [8.0.0-alpha.1.26152.2 to 8.0.0-alpha.1.26203.3][1]
- Microsoft.SourceBuild.Intermediate.source-build-reference-packages

[1]:
dotnet/source-build-assets@ac35a50...9d83c59

[DependencyUpdate]: <> (End)


[marker]: <> (End:c3d369e0-9275-4689-0eb0-08db9e40a4f0)
…into merge/release/8.0.1xx-to-release/8.0.4xx
@DonnaChen888
Copy link
Copy Markdown
Contributor

Same issue as #10020
tools/Microsoft.TemplateEngine.TemplateLocalizer.Core/TemplateStringUpdater.cs(129,81): error IDE0370: (NETCORE_ENGINEERING_TELEMETRY=Build) Suppression is unnecessary (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0370)

@DonnaChen888 DonnaChen888 force-pushed the merge/release/8.0.1xx-to-release/8.0.4xx branch from 6c5575f to 1948282 Compare April 10, 2026 08:27
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.

3 participants