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

Merge changes to release branch #2629

Merged
merged 157 commits into from
Sep 30, 2021

Conversation

hoyosjs
Copy link
Member

@hoyosjs hoyosjs commented Sep 30, 2021

cc: @dotnet/dotnet-monitor

mikelle-rogers and others added 30 commits July 23, 2021 17:51
Co-authored-by: Mikelle Rogers <mirogers@microsoft.com>
* Fix asssuption in SOS what the IXClrDataModule::GetFlags returns.

* Update to lldb-included Alpine 3.13 container

* Try node image for agent comms

* Use container with correct metadata to node path

* Remove libintl dependencies

* Update dependencies from https://github.com/dotnet/runtime build 20210724.7

Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-preview.7.21361.10 -> To Version 6.0.0-rc.1.21374.7

* Disable testing against dumps on Alpine for now (until the 6.0 createdump change is in)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Mike McLaughlin <mikem@microsoft.com>
Co-authored-by: Juan Hoyos <juan.hoyos@microsoft.com>
Co-authored-by: Juan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
…0725.2 (dotnet#2449)

[main] Update dependencies from dotnet/runtime
[main] Update dependencies from dotnet/aspnetcore
…0726.24 (dotnet#2454)

[main] Update dependencies from dotnet/runtime
…0210727.2 (dotnet#2453)

[main] Update dependencies from dotnet/aspnetcore
…otnet#2452)

- Depends on dotnet/runtime#56346
- Reverted commit 3d57bee from PR dotnet#2324 since the relevant change to `ThreadCounts` was reverted in dotnet/runtime#56346
…0728.2 (dotnet#2457)

[main] Update dependencies from dotnet/runtime
…0210728.1 (dotnet#2456)

[main] Update dependencies from dotnet/aspnetcore
…s on 6.0 (dotnet#2460)

* Update alpine image that includes lldb python support

* Enable lldb and dump tests on Alpine

* Don't run the bpmd portions of the tests on Alpine

* Add requiresCapPtraceContainer:true to Alpine legs
…0210729.1 (dotnet#2461)

[main] Update dependencies from dotnet/aspnetcore
…0728.9 (dotnet#2462)

[main] Update dependencies from dotnet/runtime
Fixes some of the issues in dotnet#2375

The problem is that the image mapping memory service didn't convert the rva from a
loaded layout calculated from the in-memory module to the file layout (the PEReader
with the downloaded image).

On Windows, images (native or managed) are always loaded layout so return false in
IModule.IsFileLayout without calling GetPEInfo() to avoid the recursion that broken
getting the info about coreclr.dll. It turns out that the heap dumps generated on
Windows don't have the image in-memory.

Don't get module version in GetPEInfo() to determine the layout. Cleanup.

Skip relocations that span cache blocks. This happens very rarely and should not affect
anything unless we get really really unlucky.
…0210729.10 (dotnet#2464)

[main] Update dependencies from dotnet/aspnetcore
…0730.1 (dotnet#2465)

[main] Update dependencies from dotnet/runtime
…0210731.1 (dotnet#2467)

[main] Update dependencies from dotnet/aspnetcore
…0730.13 (dotnet#2468)

[main] Update dependencies from dotnet/runtime
…0210731.3 (dotnet#2469)

[main] Update dependencies from dotnet/aspnetcore
…0801.1 (dotnet#2470)

[main] Update dependencies from dotnet/runtime
…0801.3 (dotnet#2471)

[main] Update dependencies from dotnet/runtime
…0802.10 (dotnet#2474)

[main] Update dependencies from dotnet/runtime
…0803.13 (dotnet#2475)

[main] Update dependencies from dotnet/runtime
…0210804.1 (dotnet#2479)

[main] Update dependencies from dotnet/aspnetcore
…0210804.17 (dotnet#2481)

[main] Update dependencies from dotnet/aspnetcore
…0805.1 (dotnet#2482)

[main] Update dependencies from dotnet/runtime
mikem8361 and others added 24 commits September 20, 2021 16:32
Fix misc SOS bugs

* Fix bug in the AddFilesFromDirectoryToTpaList issue: dotnet#2596

* Added some logging to GetLineByOffset

* Improve SymbolService.ParseSymbolPath support for Watson. Issue dotnet#2512. Can
now handle the various symbol paths that Watson can throw at us. Doesn't support actually calling the symbol server
dll like in the symsrv*symaudit.dll*\\server\share syntax. The dll is ignored.

* Minor doc updates

* Better loadsymbols error message when no server is set
…0210917.1 (dotnet#2599)

[main] Update dependencies from dotnet/aspnetcore
…10920.1 (dotnet#2605)

[main] Update dependencies from dotnet/symstore
…0210921.8 (dotnet#2604)

[main] Update dependencies from dotnet/aspnetcore
* Update dependencies from https://github.com/dotnet/runtime build 20210920.22

Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0-rc.2.21464.21 -> To Version 6.0.0-rtm.21470.22

* Fix SOS bpmd tests on 6.0 runtime

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Mike McLaughlin <mikem@microsoft.com>
…0210921.45 (dotnet#2609)

[main] Update dependencies from dotnet/aspnetcore
…0921.19 (dotnet#2610)

[main] Update dependencies from dotnet/runtime
…0210923.1 (dotnet#2612)

[main] Update dependencies from dotnet/aspnetcore
…0922.13 (dotnet#2613)

[main] Update dependencies from dotnet/runtime
…0210924.1 (dotnet#2614)

[main] Update dependencies from dotnet/aspnetcore
…0210924.41 (dotnet#2616)

[main] Update dependencies from dotnet/aspnetcore
…0210925.9 (dotnet#2618)

[main] Update dependencies from dotnet/aspnetcore
…924.2 (dotnet#2619)

[main] Update dependencies from dotnet/arcade
…210926.2 (dotnet#2620)

[main] Update dependencies from dotnet/installer
…0210927.30 (dotnet#2622)

[main] Update dependencies from dotnet/aspnetcore
…10927.1 (dotnet#2623)

[main] Update dependencies from dotnet/symstore
…0927.8 (dotnet#2624)

[main] Update dependencies from dotnet/runtime
…0210929.1 (dotnet#2626)

[main] Update dependencies from dotnet/aspnetcore
…0928.11 (dotnet#2627)

[main] Update dependencies from dotnet/runtime
* Add glob support for asp.net triggers

* PR feedback

* Pr feedback
@hoyosjs hoyosjs self-assigned this Sep 30, 2021
@hoyosjs hoyosjs requested a review from a team as a code owner September 30, 2021 00:20
@hoyosjs hoyosjs merged commit fbe3b89 into dotnet:release/stable Sep 30, 2021
@hoyosjs hoyosjs deleted the juhoyosa/merge-main-to-release branch September 30, 2021 11:05
@github-actions github-actions bot locked and limited conversation to collaborators Jan 14, 2024
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.