[automated] Merge branch 'release/7.0' => 'release/7.0-staging' #87524
Conversation
…pes that implements INullable
…ypes that implements INullable CVE-2023-24936: Check type is allowed when deserializing instance types that implements INullable
…LibraryImportGenerator Adds a "paramName_lastIndexMarshalled" variable to generated code that tracks the index of the last element in a collection that was marshalled. Then in the cleanup stage, we only clean up to that index. This works for single dimensional arrays of non-blittable elements. For multidimensional arrays, this will fully initialize higher order arrays to simplify the generated logic. It is possible to avoid this and can be considered in a future PR, if we observe users of multi-dimensional arrays observing performance issues.
… and enable delay load of version.dll `coreclr` delay loads `version.dll` and adds a hook such that it loads from the system directory. In single-file, we lost this behaviour since it uses static library version of `coreclr`. This adds the same mechanism to single-file.
…e loading Block password-less PKCS12 blobs on X509 certificate loadings/imports and Prevet AIA fetching of non-cert types.
Merge from public release/7.0 to internal/release/7.0 and resolve conflicts if necessary
…-merge-7.0-2023-06-13-1018
….0-2023-06-13-1018 Merging internal commits for release/7.0
|
Tagging subscribers to this area: @dotnet/area-system-security, @bartonjs, @vcsjones Issue DetailsI detected changes in the release/7.0 branch which have not been merged yet to release/7.0-staging. I'm a robot and am configured to help you automatically keep release/7.0-staging up to date, so I've opened this PR. This PR merges commits made on release/7.0 by the following committers:
Instructions for merging from UIThis 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. 
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. Instructions for merging via command lineRun these commands to merge this pull request from the command line. git fetch
git checkout release/7.0
git pull --ff-only
git checkout release/7.0-staging
git pull --ff-only
git merge --no-ff release/7.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/7.0-to-release/7.0-stagingor if you are using SSHAfter PR checks are complete push the branch Instructions for resolving conflictsInstructions for updating this pull requestContributors to this repo have permission update this pull request by pushing to the branch 'merge/release/7.0-to-release/7.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. or if you are using SSHContact .NET Core Engineering if you have questions or issues.
|
carlossanlop
added
area-codeflow
ghost
locked as resolved and limited conversation to collaborators
I detected changes in the release/7.0 branch which have not been merged yet to release/7.0-staging. I'm a robot and am configured to help you automatically keep release/7.0-staging up to date, so I've opened this PR.
This PR merges commits made on release/7.0 by the following committers:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/7.0-to-release/7.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
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.