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/7.0-rc1' => 'release/7.0' #74205

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

This PR merges commits made on release/7.0-rc1 by the following committers:

  • alhad-deshpande

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/7.0-rc1
git pull --ff-only
git checkout release/7.0
git pull --ff-only
git merge --no-ff release/7.0-rc1

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

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

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

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.

alhad-deshpande and others added 2 commits August 18, 2022 18:08
* Avoid transformation from multiplication to left shift in case of 64 bit value

* Fixed System.Collections.Concurrent.Tests timeout issue

* [ppc64le] Fixed test case failures

* [ppc64le] Incorporated code review comments

Co-authored-by: Sapana Khemkar <sapana.khemkar@ibm.com>
Co-authored-by: Sapana-Khemkar <94051076+Sapana-Khemkar@users.noreply.github.com>
Co-authored-by: Anton Lapounov <antonl@microsoft.com>
@ghost
Copy link

ghost commented Aug 19, 2022

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/7.0-rc1 branch which have not been merged yet to release/7.0. I'm a robot and am configured to help you automatically keep release/7.0 up to date, so I've opened this PR.

This PR merges commits made on release/7.0-rc1 by the following committers:

  • alhad-deshpande

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/7.0-rc1
git pull --ff-only
git checkout release/7.0
git pull --ff-only
git merge --no-ff release/7.0-rc1

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

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

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

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: -

github-actions bot and others added 5 commits August 19, 2022 21:24
Co-authored-by: Larry Ewing <lewing@microsoft.com>
…ix field layout behavior (dotnet#74279)

* First stab at support for proper 128bit integer layout and abi

* Add ABI tests for Int128 covering interesting scenarios

* Fix bugs so that at least Windows Arm64 works

* Add more types to the ABI tester, so that we cover the Int128 scenarios

* Revert changes which attempted to enable by value passing for Int128

* Make Int128 have layout match the expected unmanaged field layout - On Unix platforms (64 bit) use 16 byte alignment - On Arm32 use 8 byte alignment matching the 128 byte vector type - On other Windows platforms the 128 bit integer type isn't defined by the C compiler, but match the behavior of other 128 bit types (16 byte alignment)

Add tests to call down to native that should pass with these rules

- Disable use of Int128 as p/invoke parameter passed by value

* Mark Int128 types as not having a stable abi - This disables use of these types for parameter passing in R2R images

* Address all known issues

* Try to fix PR job

* Should fix the test issues

* Apply suggestions from code review

Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com>

Co-authored-by: David Wrighton <davidwr@microsoft.com>
Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Lets us make dotnet#72645 a non-blocking-release issue.

We also set NativeAotSupported to false for Mac on the line above. Crossgen2 will still ship NativeAOT compiled on x64 Linux and Windows. R2R+SingleFile+Trimmed elsewhere.

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
…#74220)

* Add a way to suppress all trimming warnings

Fixes dotnet#73926.

Also adding AOT analysis suppression for parity.

I didn't port the warning level support because the compat kind of goes beyond that. We can revisit later if needed.

* Update Microsoft.NETCore.Native.targets

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
Port of dotnet/linker#2979

Fixes dotnet#73048.

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants