Skip to content
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

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #44030

Merged
merged 12 commits into from
Oct 9, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 9, 2024

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

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

  • marcpopMSFT
  • nagilson
  • 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.1xx
git pull --ff-only
git checkout release/8.0.3xx
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/sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx

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.3xx'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0.1xx-to-release/8.0.3xx release/8.0.3xx
git pull https://github.com/dotnet/sdk merge/release/8.0.1xx-to-release/8.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx
or if you are using SSH
git checkout -b merge/release/8.0.1xx-to-release/8.0.3xx release/8.0.3xx
git pull git@github.com:dotnet/sdk merge/release/8.0.1xx-to-release/8.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/8.0.1xx-to-release/8.0.3xx

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.

marcpopMSFT and others added 11 commits September 13, 2024 13:36
Disable the EOL message for two publishing tests
…925.3

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24463.3 -> To Version 8.0.0-beta.24475.3
…0241002.4

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.109-servicing.24415.13 -> To Version 8.0.111-servicing.24502.4
…003.12

Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset
 From Version 4.8.0-7.24501.6 -> To Version 4.8.0-7.24503.12
…004.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2
@github-actions github-actions bot requested a review from a team as a code owner October 9, 2024 15:56
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Oct 9, 2024
@marcpopMSFT marcpopMSFT merged commit 475dd9b into release/8.0.3xx Oct 9, 2024
17 checks passed
@marcpopMSFT marcpopMSFT deleted the merge/release/8.0.1xx-to-release/8.0.3xx branch October 9, 2024 19:33
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