Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jul 8, 2025

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

  • SimonZhao888
  • nagilson
  • MiYanni
  • 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/8.0.3xx
git pull --ff-only
git checkout release/8.0.4xx
git pull --ff-only
git merge --no-ff release/8.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/sdk HEAD:merge/release/8.0.3xx-to-release/8.0.4xx
or if you are using SSH
git push [email protected]:dotnet/sdk HEAD:merge/release/8.0.3xx-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.3xx-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.3xx-to-release/8.0.4xx origin/release/8.0.4xx
git pull https://github.com/dotnet/sdk merge/release/8.0.3xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/8.0.3xx-to-release/8.0.4xx
or if you are using SSH
git fetch
git checkout -b merge/release/8.0.3xx-to-release/8.0.4xx origin/release/8.0.4xx
git pull [email protected]:dotnet/sdk merge/release/8.0.3xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/sdk HEAD:merge/release/8.0.3xx-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 11 commits June 17, 2025 02:02
…ence-packages build 20250616.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25269.2 -> To Version 8.0.0-alpha.1.25316.2
…0250616.3

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.118-servicing.25310.1 -> To Version 8.0.118-servicing.25316.3
…merge/release/8.0.1xx-to-release/8.0.3xx
…merge/release/8.0.1xx-to-release/8.0.3xx
@SimonZhao888
Copy link
Member

Container registry issues.

@nagilson nagilson enabled auto-merge July 8, 2025 16:54
@nagilson nagilson added the needs team triage Requires a full team discussion label Jul 8, 2025
@nagilson
Copy link
Member

nagilson commented Jul 8, 2025

@dsplaisted May you help merge this on red? Its blocking the code flow and entire build only due to a containers test

@nagilson
Copy link
Member

nagilson commented Jul 8, 2025

Actually, we should probably just disable those tests until they get fixed. They are failing at a very high rate. @dotnet/sdk-container-builds-maintainers Any issue with this?

@nagilson nagilson added the Area-Containers Related to dotnet SDK containers functionality label Jul 8, 2025
These tests have a high number of failures documented at (Skip = "#49502").
The registry issue may not be solved until funding is increased or engineering effort is made to handle this case better and not run the tests.
@nagilson nagilson requested a review from a team as a code owner July 8, 2025 17:10
@nagilson nagilson merged commit 1bb93d3 into release/8.0.4xx Jul 8, 2025
17 of 18 checks passed
@nagilson nagilson deleted the merge/release/8.0.3xx-to-release/8.0.4xx branch July 8, 2025 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Containers Related to dotnet SDK containers functionality needs team triage Requires a full team discussion

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants