[manual] Merge release/6.0-staging into release/6.0#95150
Merged
carlossanlop merged 4 commits intodotnet:release/6.0from Nov 23, 2023
carlossanlop:release/6.0-staging
Merged
[manual] Merge release/6.0-staging into release/6.0#95150carlossanlop merged 4 commits intodotnet:release/6.0from carlossanlop:release/6.0-staging
carlossanlop merged 4 commits intodotnet:release/6.0from
carlossanlop:release/6.0-staging
Conversation
…o-release/6.0-staging [automated] Merge branch 'release/6.0' => 'release/6.0-staging'
…iagnostics (#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>
…017.3 (#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
added
Servicing-approved
carlossanlop
requested review from
GrabYourPitchforks,
ViktorHofer,
hoyosjs,
jeffhandley,
lewing,
pchaurasia14,
radical and
steveisok
This was referenced Nov 23, 2023
Closed
GrabYourPitchforks
approved these changes
Nov 23, 2023
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Merge commit!