This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
[automated] Merge branch 'master' => 'release/3.0' #24169
Merged
wtgodbe
merged 27 commits into
dotnet:release/3.0
from
dotnet-maestro-bot:merge/master-to-release/3.0
Apr 22, 2019
Merged
[automated] Merge branch 'master' => 'release/3.0' #24169
wtgodbe
merged 27 commits into
dotnet:release/3.0
from
dotnet-maestro-bot:merge/master-to-release/3.0
Apr 22, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
…ting Fix Arm32 Ubuntu CoreFX script.
Fix bug in impGetStructAddr.
Implement APIs for some threading metrics (CoreCLR) API review: https://github.com/dotnet/corefx/issues/35500
…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*, ...)
Add a repro test for #24114.
…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
@kouvel yes, please back that commit out - thanks for noticing that! |
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 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
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/master-to-release/3.0'. 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.