Skip to content
This repository was archived by the owner on Jan 11, 2024. It is now read-only.

[automated] Merge branch 'release/2.2' => 'master'#2159

Merged
weshaggard merged 2 commits intodotnet:masterfrom
dotnet-maestro-bot:merge/release/2.2-to-master
Sep 5, 2018
Merged

[automated] Merge branch 'release/2.2' => 'master'#2159
weshaggard merged 2 commits intodotnet:masterfrom
dotnet-maestro-bot:merge/release/2.2-to-master

Conversation

@dotnet-maestro-bot
Copy link

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.

merge button instructions

You can also do this on command line:

git checkout master
git pull
git fetch --force https://github.com/dotnet-maestro-bot/buildtools-1 merge/release/2.2-to-master:merge/release/2.2-to-master
git merge merge/release/2.2-to-master
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.

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.

joperezr and others added 2 commits August 31, 2018 09:52
…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'
@weshaggard
Copy link
Member

@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.

@joperezr
Copy link
Member

joperezr commented Sep 5, 2018

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.

@weshaggard
Copy link
Member

OK I'll go ahead and merge then. Did you make the same change in the targets we are now using from coreclr?

@weshaggard weshaggard merged commit 059200b into dotnet:master Sep 5, 2018
@joperezr
Copy link
Member

joperezr commented Sep 5, 2018

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.

@tannergooding
Copy link
Member

I did not port this particular handling to the CoreCLR targets, it is directly part of the System.Runtime.CompilerServices.Unsafe.ilproj.

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 IlasmResourceFile switch, and not the resource file extraction part.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants