Skip to content

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
  • 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/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.

dotnet-bot and others added 14 commits October 20, 2023 19:17
Chain building can sometimes return nonsensical values when an internal error is encountered. This changes the behavior so that chain building will throw instead of returning nonsensical values.

A compat switch is provided so apps can opt out of this behavior.

Fixes CVE-2024-0057.
* Update dependencies from https://github.com/dotnet/emsdk build 20231122.1

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.25 -> To Version 6.0.25

* Update dependencies from https://github.com/dotnet/emsdk build 20231205.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.25 -> To Version 6.0.26

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
….0-2024-01-09-1128

Merging internal commits for release/6.0
@ghost ghost added the area-codeflow for labeling automated codeflow label Jan 9, 2024
@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Jan 9, 2024
Copy link
Contributor

@carlossanlop carlossanlop left a comment

Choose a reason for hiding this comment

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

Merge commit

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants