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/9.0.1xx' => 'release/9.0.2xx' #44729

Merged
merged 37 commits into from
Nov 8, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 7, 2024

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

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

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

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

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

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 30 commits October 8, 2024 14:27
Nuget 6.11.1 switched back to depending on 17.8 so we should be able to revert this back
…11.3

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.24502.7 -> To Version 9.0.0-preview.24511.3
…15.1

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.24511.3 -> To Version 9.0.0-preview.24515.1
…15.6

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.24515.1 -> To Version 9.0.0-preview.24515.6
…016.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1
…0241017.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.404-servicing.24511.10 -> To Version 8.0.404-servicing.24517.2
…nals build 20241016.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24510.2 -> To Version 8.0.0-alpha.1.24516.2
…the correct port for the HTTP protocol (#44234)

Co-authored-by: Dameng <313880747@qq.com>
After this flows to 9.0.2xx and we get a loc build from there, we'll need to file an internal ticket to change the backend loc target branch.
…104.2

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.11.0-3.24510.3 -> To Version 4.11.0-3.24554.2
…23.7

Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.24515.6 -> To Version 9.0.0-preview.24523.7
…026.2

Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler
 From Version 8.0.403-beta.24509.1 -> To Version 8.0.403-beta.24526.2
…025.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24516.1 -> To Version 8.0.0-beta.24525.2
…0241106.3

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 9.0.100-rtm.24518.2 -> To Version 9.0.101-servicing.24556.3
dotnet-maestro bot and others added 2 commits November 7, 2024 13:51
…0241106.2

Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab
 From Version 9.0.0-beta.24554.2 -> To Version 9.0.0-beta.24556.2
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Nov 7, 2024
@github-actions github-actions bot requested a review from a team as a code owner November 7, 2024 21:05
@MiYanni MiYanni merged commit e3f4bc0 into release/9.0.2xx Nov 8, 2024
32 checks passed
@MiYanni MiYanni deleted the merge/release/9.0.1xx-to-release/9.0.2xx branch November 8, 2024 20:38
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.

5 participants