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.

Sign up for GitHub

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

Jump to bottom

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #92979

Merged
merged 6 commits into from
Oct 13, 2023
Merged

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #92979

merged 6 commits into from
Oct 13, 2023

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

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

  • 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/6.0
git pull --ff-only
git checkout release/6.0-staging
git pull --ff-only
git merge --no-ff release/6.0

# 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-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging
or if you are using SSH 
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging

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

git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging
or if you are using SSH 
git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

@ghost
Copy link

ghost commented Oct 4, 2023

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

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

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

  • 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/6.0
git pull --ff-only
git checkout release/6.0-staging
git pull --ff-only
git merge --no-ff release/6.0

# 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-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging
or if you are using SSH 
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging

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

git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging
or if you are using SSH 
git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull git@github.com:dotnet-maestro-bot/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime HEAD:merge/release/6.0-to-release/6.0-staging

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Author: dotnet-maestro-bot
Assignees: -
Labels:

area-Infrastructure-libraries
Milestone: -

carlossanlop
carlossanlop approved these changes Oct 4, 2023
View reviewed changes
Copy link
Member

@carlossanlop carlossanlop left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge commit.

Should merge immediately this only if the staging PRs are failing to find nuget packages due to their version. Otherwise, wait until code complete day to merge it.

@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Oct 4, 2023
@carlossanlop carlossanlop added this to the 6.0.24 milestone Oct 4, 2023
@build-analysis build-analysis bot mentioned this pull request Oct 4, 2023
Open
vseanreesermsft and others added 3 commits October 10, 2023 10:27
@vseanreesermsft
Merge commit 'e0f0de876a67755a2c6cd2dc730c13f5959bdea8' into internal…
0bd8579 
…-merge-6.0-2023-10-10-1026
@carlossanlop
Merge pull request dotnet#93306 from vseanreesermsft/internal-merge-6…
4e8c523 
….0-2023-10-10-1026

Merging internal commits for release/6.0
@dotnet-maestro
[release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk (do…
e505120 
…tnet#93394)

* Update dependencies from https://github.com/dotnet/arcade build 20231011.8

Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 6.0.0-beta.23408.5 -> To Version 6.0.0-beta.23511.8

* Update dependencies from https://github.com/dotnet/emsdk build 20231012.2

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.23 -> To Version 6.0.23

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This was referenced Oct 13, 2023
Open
Open
Open
Closed
Closed
@dotnet-maestro @carlossanlop
Update dependencies from https://github.com/dotnet/xharness build 202…
a15b9c9 
…30905.2 (dotnet#93397)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 6.0.0-prerelease.23401.2 -> To Version 6.0.0-prerelease.23455.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
@carlossanlop carlossanlop merged commit 21783bb into dotnet:release/6.0-staging Oct 13, 2023
263 of 280 checks passed
This was referenced Oct 13, 2023
Open
Closed
@ghost ghost locked as resolved and limited conversation to collaborators Nov 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@carlossanlop carlossanlop carlossanlop approved these changes

Assignees
No one assigned
Labels
area-Infrastructure-libraries Servicing-approved Approved for servicing release
Projects
None yet
Milestone
6.0.24
Development

Successfully merging this pull request may close these issues.
4 participants
@dotnet-maestro-bot @carlossanlop @dkurepa @vseanreesermsft