Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[automated] Merge branch 'master' => 'release/3.0' #24169

Merged

Conversation

dotnet-maestro-bot
Copy link

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

This PR merges commits made on master 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.

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

# 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/coreclr HEAD:merge/master-to-release/3.0
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/coreclr HEAD:merge/master-to-release/3.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/master-to-release/3.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/master-to-release/3.0 release/3.0
git pull https://github.com/dotnet-maestro-bot/coreclr merge/master-to-release/3.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/coreclr merge/master-to-release/3.0
or if you are using SSH
git checkout -b merge/master-to-release/3.0 release/3.0
git pull [email protected]:dotnet-maestro-bot/coreclr merge/master-to-release/3.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/coreclr merge/master-to-release/3.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.

Fadi Hanna and others added 27 commits April 19, 2019 14:10
* Fix project metadata in test
* Update dependencies from https://github.com/dotnet/corefx build 20190418.11

- Microsoft.NETCore.Platforms - 3.0.0-preview5.19218.11
- Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview5.19218.11

* Disable outdated test
…eScalar (dotnet#24123)

* Update dependencies from https://github.com/dotnet/corefx build 20190419.5

    - Microsoft.NETCore.Platforms - 3.0.0-preview5.19219.5
    - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview5.19219.5

* Removing the Sse2.StoreLow(long/ulong*, ...) methods that have been replaced

* Moving the Sse2.StoreLow(long/ulong*, ...) tests to be Sse2.StoreScalar tests

* Fixing some existing usages of Sse2.StoreLow(long/ulong*, ...)
…0190420.01 (dotnet#24142)

- Microsoft.NETCore.App - 3.0.0-preview5-27620-01
* Adding PendingTypeLoadEntry to Crst order for EventPipeCrst

* update header file
…419.11 (dotnet#24141)

- Microsoft.NETCore.Platforms - 3.0.0-preview5.19219.11
- Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview5.19219.11
…dotnet#24120)

- optimization.IBC.CoreCLR - 99.99.99-master-20190420.1
- optimization.PGO.CoreCLR - 99.99.99-master-20190420.1
…espectively (master) (dotnet#24060)

* Update BuildTools, CoreClr to preview4-03917-01, preview5-27618-71, respectively

* Fix build errors

* Disable warning with pragma and linked issue
* Add ContextualReflection LoadWithPartialName case

* Remove unnecessary MethodImplOptions.NoInlining

* Remove m_assembly warning

* Fix AssemblyName hash function

* AssemblyNative::Load fix stackMark usage

Do not use the stackMark if (ptrLoadContextBinder != NULL)

* Temporarily disable DefaultContextOverrideTPA

Test is failing due to a logic error.
Fix is pending in dotnet/corefx#37071
* Fix Arm64 UpperVector save/restore

Change the general handling of end-of-block restores so that we always have a RefPosition on which to allocate the register needed on Arm64.

Fix #23885
* Remove RuntimeAssembly.CreateAssemblyName

Fixes #24135

CreateAssemblyName was not compatible with AssemblyLoadContext isolation.

Assembly.Load(string)
Assembly.LoadWithPartialName(string)
Activator.CreateInstance(...)

* Remove unused AssemblyNameNative::Init arguments

* Temp disable corefx CreateInstanceAssemblyResolve
@wtgodbe wtgodbe self-assigned this Apr 22, 2019
@kouvel
Copy link
Member

kouvel commented Apr 22, 2019

My commit "Implement APIs for some threading metrics (CoreCLR) (#24113)" (0410c3e) does not need to go into preview 5, as it's one part of a multi-part change and they will not all make it into preview 5. Should I remove that commit from this PR?

@wtgodbe
Copy link
Member

wtgodbe commented Apr 22, 2019

@kouvel yes, please back that commit out - thanks for noticing that!

@kouvel
Copy link
Member

kouvel commented Apr 22, 2019

Discussed offline with @wtgodbe, will leave in the commit for easing history, it shouldn't break build and the new APIs won't be available anyway

@wtgodbe wtgodbe merged commit 8651946 into dotnet:release/3.0 Apr 22, 2019
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.