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.

Sign up for GitHub

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

Jump to bottom

[manual] Merge release/6.0-staging into release/6.0 #95150

Merged
merged 4 commits into from
Nov 23, 2023
Merged

[manual] Merge release/6.0-staging into release/6.0 #95150

merged 4 commits into from
Nov 23, 2023

Conversation

carlossanlop
Copy link
Member

Merge commit!

liveans and others added 4 commits November 16, 2023 11:05
@liveans
Disable socket tests (dotnet#94577)
8301522
@carlossanlop
Merge pull request dotnet#94748 from dotnet-maestro-bot/merge/release…
e476fa3 
…/6.0-to-release/6.0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@github-actions @elinor-fung
[release/6.0-staging] Store entry assembly path for easy access for d…
98bb208 
…iagnostics (dotnet#95049)

* Store entry assembly path for easy access for diagnostics

- Add `g_EntryAssemblyPath` global variable holding the full path to the entry assembly
  - Set right before loading the entry assembly (so also before startup hooks are run) - NULL if there is no entry assembly
- Ensure value is included dumps
  - For triage dumps, the dumped value is updated to only be the assembly file name instead of the full path

* Use wcs functions (u16_* wrappers were added in 8.0)

* Update src/coreclr/inc/dacvars.h

---------

Co-authored-by: Elinor Fung <elfung@microsoft.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20231…
456beb2 
…017.3 (dotnet#95030)

Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 6.0.0-beta.23511.8 -> To Version 6.0.0-beta.23517.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Nov 22, 2023
@carlossanlop carlossanlop self-assigned this Nov 22, 2023
This was referenced Nov 23, 2023
Closed
Closed
Closed
@carlossanlop carlossanlop merged commit a6c52c0 into dotnet:release/6.0 Nov 23, 2023
295 of 324 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Dec 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@GrabYourPitchforks GrabYourPitchforks GrabYourPitchforks approved these changes

@radical radical Awaiting requested review from radical

@lewing lewing Awaiting requested review from lewing

@steveisok steveisok Awaiting requested review from steveisok

@jeffhandley jeffhandley Awaiting requested review from jeffhandley

@ViktorHofer ViktorHofer Awaiting requested review from ViktorHofer

@hoyosjs hoyosjs Awaiting requested review from hoyosjs

@pchaurasia14 pchaurasia14 Awaiting requested review from pchaurasia14

Assignees

@carlossanlop carlossanlop

Labels
area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@carlossanlop @GrabYourPitchforks @liveans