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.4xx' => 'release/9.0.1xx' #45882

Merged
merged 29 commits into from
Jan 13, 2025

Conversation

github-actions[bot]
Copy link
Contributor

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

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

  • 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.4xx
git pull --ff-only
git checkout release/9.0.1xx
git pull --ff-only
git merge --no-ff release/8.0.4xx

# 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.4xx-to-release/9.0.1xx
or if you are using SSH
git push [email protected]:dotnet/sdk HEAD:merge/release/8.0.4xx-to-release/9.0.1xx

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

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 22 commits December 29, 2024 09:05
…29.6

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 7.0.0-preview.24574.1 -> To Version 7.0.0-preview.24629.6
…229.8

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.24574.2 -> To Version 4.8.0-7.24629.8
…223.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24570.5 -> To Version 8.0.0-beta.24623.2
…106.18

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.24574.2 -> To Version 4.8.0-7.25056.18
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…darc-release/8.0.1xx-c3ddf5d8-c0e6-49da-a89e-0d900d141785
…darc-release/8.0.1xx-308fc65c-a1c1-4350-9363-820f93868bbe
…darc-release/8.0.1xx-6474472e-d3e1-4d0b-a390-93014cbaf3c5
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <[email protected]>
…merge/release/8.0.1xx-to-release/8.0.3xx
…0250107.10

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.309-servicing.25057.7 -> To Version 8.0.309-servicing.25057.10
…0250109.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.309-servicing.25057.10 -> To Version 8.0.309-servicing.25059.1
…merge/release/8.0.3xx-to-release/8.0.4xx
…als (#45868)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <[email protected]>
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Jan 10, 2025
dotnet-maestro bot and others added 6 commits January 11, 2025 05:03
…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
…nals build 20250110.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.25060.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.4xx-to-release/9.0.1xx
@v-wuzhai v-wuzhai merged commit 2cee35b into release/9.0.1xx Jan 13, 2025
32 checks passed
@v-wuzhai v-wuzhai deleted the merge/release/8.0.4xx-to-release/9.0.1xx branch January 13, 2025 10:24
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.

1 participant