[automated] Merge branch 'release/2.2' => 'master'#2159
[automated] Merge branch 'release/2.2' => 'master'#2159weshaggard merged 2 commits intodotnet:masterfrom
Conversation
…roduce resources for System.Runtime.CompilerServices.Unsafe.dll (dotnet#2127)
…2.1-to-release/2.2 [automated] Merge branch 'release/2.1' => 'release/2.2'
|
@joperezr is this change interesting for master? I suspect given that we changed how we consume ilasm it isn't but would like you to confirm. |
|
I had already done this on master on #2123 so not sure why this isn't clashing with that. This change was done in master first, and then ported to the release branch. |
|
OK I'll go ahead and merge then. Did you make the same change in the targets we are now using from coreclr? |
I asked @tannergooding to do it on his PR, which I believe he did. |
|
I did not port this particular handling to the CoreCLR targets, it is directly part of the Most of the handling was not-cross platform and was fairly specific to the CoreFX setup. We should (and I'll create a PR to do so) probably port just the |
I detected changes in the release/2.2 branch which have not been merged yet to master.
I'm a robot and am configured to help you automatically keep master up to date, so
I've opened this PR.
This PR merges commits made on release/2.2 by the following committers:
Instructions for merging
This PR will not be auto-merged. When pull request checks pass, please complete this PR
by creating a merge commit, not a squash or rebase commit.
You can also do this on command line:
Instructions for resolving conflicts
You can do this using GitHub
or using the command line.
Maintainers of this repo have permission to the branch 'merge/release/2.2-to-master' on https://github.com/dotnet-maestro-bot/buildtools-1.
You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt
to update this branch as more changes are discovered on release/2.2.
Please 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.