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' #91917

Merged
merged 15 commits into from
Sep 19, 2023
Merged

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

merged 15 commits into from
Sep 19, 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:

  • carlossanlop
  • 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 13 commits August 1, 2023 22:22
@dotnet-bot
Merge in 'release/6.0' changes
5a21898
@dotnet-bot
Merge in 'release/6.0' changes
a51eda7
@dotnet-bot
Merge in 'release/6.0' changes
7deb767
@dotnet-bot
Merge in 'release/6.0' changes
0c20206
@dotnet-bot
Merge in 'release/6.0' changes
8eab88d
@hoyosjs
[release/6.0] Update Microsoft.DiaSymReader.Native to 16.11.29-beta1.…
8164fed 
…23404.4
@dotnet-bot
Merge in 'release/6.0' changes
0a9fee4
@ManickaP @carlossanlop
Merged PR 32906: [6.0] Disable QUIC entirely
683c579 
Disabling QUIC and thus H/3 in .NET 6 entirely.
@carlossanlop
Merged PR 32989: [release/6.0] limit AIA download size
ad40cc3 
This prevents using unlimited resources from evil sources.
I originally wanted to split limits and have them separately for certificates, OCSP and CRLs.
However, the HttpClient.MaxResponseContentBufferSize can be set only once so I decided to keep it simple for servicing.

We could split the HttpClient and have one for small and one for large downloads.
Or alternatively we can handle the body directly. But it is going to be unpleseant with the reflection and sync & async flavors.

port of https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/pullrequest/32920
@dotnet-bot
Merge in 'release/6.0' changes
1810038
@dotnet-bot
Merge in 'release/6.0' changes
4bb6dc1
@dotnet-maestro
Update dependencies from https://github.com/dotnet/emsdk build 202308…
1a52bc1 
…31.3 (dotnet#91427)

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.22 -> To Version 6.0.23

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop
Merge pull request dotnet#91908 from carlossanlop/release/6.0-staging
7a11276 
[manual] Merge release/6.0-staging into release/6.0
@ghost
Copy link

ghost commented Sep 12, 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:

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

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

area-Infrastructure-libraries
Milestone: -

@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Sep 12, 2023
vseanreesermsft and others added 2 commits September 12, 2023 10:24
@vseanreesermsft
Merge commit '4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd' into internal…
0f364a1 
…-merge-6.0-2023-09-12-1023
@carlossanlop
Merge pull request dotnet#91951 from vseanreesermsft/internal-merge-6…
5e1c5bb 
….0-2023-09-12-1023

Merging internal commits for release/6.0
@carlossanlop carlossanlop merged commit 27746ce into dotnet:release/6.0-staging Sep 19, 2023
272 of 285 checks passed
@ghost ghost locked as resolved and limited conversation to collaborators Oct 19, 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
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dotnet-maestro-bot @carlossanlop @dotnet-bot @hoyosjs @ManickaP @vseanreesermsft