Skip to content

[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' #45976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jan 15, 2025

Conversation

github-actions[bot]
Copy link
Contributor

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:

  • joeloff
  • dotnet-maestro[bot]
  • v-wuzhai

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 git@github.com: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 git@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 git@github.com: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 16 commits January 10, 2025 15:16
…als (#45866)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
…0250110.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.113-servicing.25057.9 -> To Version 8.0.113-servicing.25060.2
…ence-packages build 20250110.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.24415.1 -> To Version 8.0.0-alpha.1.25060.2
…110.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24623.2 -> To Version 8.0.0-beta.25060.1
…merge/release/8.0.1xx-to-release/8.0.3xx
…0250112.5

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.113-servicing.25060.2 -> To Version 8.0.113-servicing.25062.5
…merge/release/8.0.1xx-to-release/8.0.3xx
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@github-actions github-actions bot force-pushed the merge/release/8.0.3xx-to-release/8.0.4xx branch from 050f29a to 0e070de Compare January 15, 2025 00:14
@ghost ghost added Area-Infrastructure untriaged Request triage from a team member labels Jan 15, 2025
…merge/release/8.0.3xx-to-release/8.0.4xx
@v-wuzhai v-wuzhai merged commit 889ab41 into release/8.0.4xx Jan 15, 2025
17 checks passed
@v-wuzhai v-wuzhai deleted the merge/release/8.0.3xx-to-release/8.0.4xx branch January 15, 2025 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy