Skip to content

[automated] Merge branch 'release/9.0.2xx' => 'release/9.0.3xx' #48856

New issue

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

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

Already on GitHub? # to your account

Merged
merged 19 commits into from
May 16, 2025

Conversation

github-actions[bot]
Copy link
Contributor

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

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

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

  • v-wuzhai
  • vseanreesermsft
  • 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/9.0.2xx
git pull --ff-only
git checkout release/9.0.3xx
git pull --ff-only
git merge --no-ff release/9.0.2xx

# 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/9.0.2xx-to-release/9.0.3xx
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.2xx-to-release/9.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/9.0.2xx-to-release/9.0.3xx'. 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/9.0.2xx-to-release/9.0.3xx origin/release/9.0.3xx
git pull https://github.com/dotnet/sdk merge/release/9.0.2xx-to-release/9.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.2xx-to-release/9.0.3xx
or if you are using SSH
git fetch
git checkout -b merge/release/9.0.2xx-to-release/9.0.3xx origin/release/9.0.3xx
git pull git@github.com:dotnet/sdk merge/release/9.0.2xx-to-release/9.0.3xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.2xx-to-release/9.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.

dotnet-maestro bot and others added 16 commits April 18, 2025 08:39
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ld 20250424.2

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 9.0.0-preview.25163.1 -> To Version 9.0.0-preview.25224.2
…425.6

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25225.6
…427.3

Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework
 From Version 4.13.0-3.25210.5 -> To Version 4.13.0-3.25227.3
…ld 20250505.2

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 9.0.0-preview.25163.1 -> To Version 9.0.0-preview.25255.2
…505.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25255.3
…505.5

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions
 From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25255.5
…ld 20250506.2

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 9.0.0-preview.25163.1 -> To Version 9.0.0-preview.25256.2
…06.4

Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.25175.7 -> To Version 9.0.0-preview.25256.4
…ld 20250507.1

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 9.0.0-preview.25163.1 -> To Version 9.0.0-preview.25257.1
…darc-release/9.0.2xx-d92361ab-9328-4a86-9848-e735132dd000
@v-wuzhai
Copy link
Member

v-wuzhai commented May 8, 2025

Wait for #48737 to flow in first

@v-wuzhai v-wuzhai force-pushed the merge/release/9.0.2xx-to-release/9.0.3xx branch from 1b95d2e to d5adcbe Compare May 9, 2025 07:45
@v-wuzhai v-wuzhai requested a review from a team May 14, 2025 09:58
@v-wuzhai v-wuzhai merged commit 01a45a8 into release/9.0.3xx May 16, 2025
30 of 31 checks passed
@v-wuzhai v-wuzhai deleted the merge/release/9.0.2xx-to-release/9.0.3xx branch May 16, 2025 22:51
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants