Skip to content

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'#45855

Merged
v-wuzhai merged 26 commits intorelease/9.0.1xxfrom
merge/release/8.0.4xx-to-release/9.0.1xx
Jan 10, 2025
Merged

[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx'#45855
v-wuzhai merged 26 commits intorelease/9.0.1xxfrom
merge/release/8.0.4xx-to-release/9.0.1xx

Conversation

@github-actions
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:

  • v-wuzhai
  • dotnet-maestro[bot]
  • marcpopMSFT
  • 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.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 git@github.com: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 git@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 git@github.com: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 25 commits November 23, 2024 13:13
…120.5

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

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.112-servicing.24564.2 -> To Version 8.0.112-servicing.24573.2
…29.2

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.6 -> To Version 7.0.0-preview.24629.2
…229.1

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.10.0-3.24574.6 -> To Version 4.10.0-3.24629.1
…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.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.10.0-3.24574.6 -> To Version 4.10.0-3.25056.12
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.3xx-8086fac9-77be-4def-802a-8c513d7ed084
…darc-release/8.0.3xx-3afdd361-43f0-443c-8199-14b281c99c45
…darc-release/8.0.3xx-11b66b22-4cea-498a-ad90-72578322990e
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
…0250109.3

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.406-servicing.25058.1 -> To Version 8.0.406-servicing.25059.3
@ghost ghost added Area-Infrastructure untriaged Request triage from a team member labels Jan 10, 2025
@v-wuzhai v-wuzhai merged commit cb195da into release/9.0.1xx Jan 10, 2025
@v-wuzhai v-wuzhai deleted the merge/release/8.0.4xx-to-release/9.0.1xx branch January 10, 2025 09:55
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.

3 participants