Snap main into release branch #5527
Merged
Conversation
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
#5346) [main] Update dependencies from dotnet/source-build-reference-packages
[main] Update dependencies from dotnet/aspnetcore
[main] Update dependencies from dotnet/sdk
[main] Update dependencies from dotnet/arcade
[main] Update dependencies from dotnet/aspnetcore
[main] Update dependencies from microsoft/clrmd
#5352) [main] Update dependencies from dotnet/source-build-reference-packages
[main] Update dependencies from dotnet/aspnetcore
#5355) [main] Update dependencies from dotnet/source-build-reference-packages
#5357) [main] Update dependencies from dotnet/source-build-reference-packages
[main] Update dependencies from dotnet/aspnetcore
dotnet/runtime#110758 Given the cDAC only supports a small subset of the DAC apis, I have created some pared down tests that are `CDACCompatible`. Steps to run tests with cDAC: 1. Build diagnostics repo. 2. Build runtime repo. 3. Run `eng\privatebuild.cmd` in the diagnostics repo 4. Copy over relevant files from runtime repo to `.\dotnet-test`. See https://github.com/dotnet/diagnostics/blob/main/documentation/privatebuildtesting.md for example. Note, with the addition of the cDAC, `cdacreader.dll` and all of the dll's under `cdaclibs` must be copied over as well. 5. Run `eng\testsoscdac.cmd` in the diagnostics repo. The cDAC can be debugged in these tests by running the tests script with `$env:VSTEST_HOST_DEBUG=1` which waits for a debugger to attach to the test host. Use VS with the [Child Process Debugging Power Tool](https://marketplace.visualstudio.com/items?itemName=vsdbgplat.MicrosoftChildProcessDebuggingPowerTool2022) to selectively debug `cdb.exe` child process. Note this requires using mixed mode debugging. --------- Co-authored-by: Max Charlamb <maxcharlamb@microsoft.com> Co-authored-by: Steve Pfister <stpfiste@microsoft.com>
#5359) [main] Update dependencies from dotnet/source-build-reference-packages
[main] Update dependencies from dotnet/aspnetcore
This pull request updates the following dependencies [marker]: <> (Begin:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) ## From https://github.com/dotnet/runtime - **Subscription**: a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f - **Build**: [20250320.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2668425) - **Date Produced**: March 21, 2025 1:35:47 AM UTC - **Commit**: [aa8f4a3c8e5737485edd6575c7493011a07b2c66](dotnet/runtime@aa8f4a3) - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Runtime.win-x64**: [from 10.0.0-preview.3.25153.8 to 10.0.0-preview.4.25170.5][16] - **VS.Redist.Common.NetCore.SharedFramework.x64.10.0**: [from 10.0.0-preview.3.25153.8 to 10.0.0-preview.4.25170.5][16] [16]: dotnet/runtime@3cf22b7...aa8f4a3 [DependencyUpdate]: <> (End) [marker]: <> (End:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Juan Sebastian Hoyos Ayala <juan.hoyos@microsoft.com>
This pull request updates the following dependencies [marker]: <> (Begin:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) ## From https://github.com/dotnet/runtime - **Subscription**: a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f - **Build**: [20250322.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2669714) - **Date Produced**: March 23, 2025 1:28:25 AM UTC - **Commit**: [365dde344601cc5310493133cfc1ee7588be1c6f](dotnet/runtime@365dde3) - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Runtime.win-x64**: [from 10.0.0-preview.4.25169.9 to 10.0.0-preview.4.25172.3][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.10.0**: [from 10.0.0-preview.4.25169.9 to 10.0.0-preview.4.25172.3][2] [2]: dotnet/runtime@bb84123...365dde3 [DependencyUpdate]: <> (End) [marker]: <> (End:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
[main] Update dependencies from dotnet/aspnetcore
This pull request updates the following dependencies [marker]: <> (Begin:638f1194-0c1a-4d47-eb59-08d8e4d5099b) ## From https://github.com/dotnet/sdk - **Subscription**: 638f1194-0c1a-4d47-eb59-08d8e4d5099b - **Build**: [20250323.7](https://dev.azure.com/dnceng/internal/_build/results?buildId=2670316) - **Date Produced**: March 24, 2025 3:56:23 AM UTC - **Commit**: [a5fba0195a62cb0c9036522033c84644fe0e5264](dotnet/sdk@a5fba01) - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk**: [from 10.0.100-preview.3.25166.6 to 10.0.100-preview.4.25173.7][1] [1]: dotnet/sdk@bfbdeec...a5fba01 [DependencyUpdate]: <> (End) [marker]: <> (End:638f1194-0c1a-4d47-eb59-08d8e4d5099b) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Follow up to #5350 that adds the ability to use the cdac and patch a local copy of the shared framework on non-windows hosts. --------- Co-authored-by: kasperk81 <83082615+kasperk81@users.noreply.github.com>
This pull request updates the following dependencies [marker]: <> (Begin:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) ## From https://github.com/dotnet/runtime - **Subscription**: a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f - **Build**: [20250323.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2670210) - **Date Produced**: March 24, 2025 1:59:08 AM UTC - **Commit**: [a50b4a078439c518d1074c43ff4740f528d37fea](dotnet/runtime@a50b4a0) - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Runtime.win-x64**: [from 10.0.0-preview.4.25172.3 to 10.0.0-preview.4.25173.3][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.10.0**: [from 10.0.0-preview.4.25172.3 to 10.0.0-preview.4.25173.3][1] [1]: dotnet/runtime@365dde3...a50b4a0 [DependencyUpdate]: <> (End) [marker]: <> (End:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
#5371) [main] Update dependencies from dotnet/source-build-reference-packages
[main] Update dependencies from dotnet/runtime
This pull request updates the following dependencies [marker]: <> (Begin:e96c3e1a-afbc-49f7-37c9-08dc4e3803cb) ## From https://github.com/dotnet/aspnetcore - **Subscription**: e96c3e1a-afbc-49f7-37c9-08dc4e3803cb - **Build**: [20250325.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2671856) - **Date Produced**: March 25, 2025 10:33:51 PM UTC - **Commit**: [ab38f4963f7c63b8465e640341288224b4171930](dotnet/aspnetcore@ab38f49) - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.App.Ref**: [from 10.0.0-preview.4.25171.5 to 10.0.0-preview.4.25175.4][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 10.0.0-preview.4.25171.5 to 10.0.0-preview.4.25175.4][2] [2]: dotnet/aspnetcore@15cc4f4...ab38f49 [DependencyUpdate]: <> (End) [marker]: <> (End:e96c3e1a-afbc-49f7-37c9-08dc4e3803cb) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
#5376) [main] Update dependencies from dotnet/source-build-reference-packages
Regex brackets were not escaped and matched any of the interior characters Co-authored-by: Max Charlamb <maxcharlamb@microsoft.com>
#5378) [main] Update dependencies from dotnet/source-build-reference-packages
This pull request updates the following dependencies [marker]: <> (Begin:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) ## From https://github.com/dotnet/runtime - **Subscription**: a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f - **Build**: [20250326.7](https://dev.azure.com/dnceng/internal/_build/results?buildId=2672814) - **Date Produced**: March 27, 2025 3:25:21 AM UTC - **Commit**: [2adab656464e9823f345d8504b035ad46cea7aa4](dotnet/runtime@2adab65) - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NETCore.App.Runtime.win-x64**: [from 10.0.0-preview.4.25175.7 to 10.0.0-preview.4.25176.7][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.10.0**: [from 10.0.0-preview.4.25175.7 to 10.0.0-preview.4.25176.7][1] [1]: dotnet/runtime@5266e7d...2adab65 [DependencyUpdate]: <> (End) [marker]: <> (End:a9fe20fc-c5cb-441c-a7ce-08dc4e3fac2f) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This pull request updates the following dependencies [marker]: <> (Begin:e96c3e1a-afbc-49f7-37c9-08dc4e3803cb) ## From https://github.com/dotnet/aspnetcore - **Subscription**: e96c3e1a-afbc-49f7-37c9-08dc4e3803cb - **Build**: [20250326.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2672742) - **Date Produced**: March 27, 2025 12:24:06 AM UTC - **Commit**: [c7524675bd26477144128afba9f37ea3f3d251ef](dotnet/aspnetcore@c752467) - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.App.Ref**: [from 10.0.0-preview.4.25175.4 to 10.0.0-preview.4.25176.5][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 10.0.0-preview.4.25175.4 to 10.0.0-preview.4.25176.5][1] [1]: dotnet/aspnetcore@ab38f49...c752467 [DependencyUpdate]: <> (End) [marker]: <> (End:e96c3e1a-afbc-49f7-37c9-08dc4e3803cb) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This pull request updates the following dependencies [marker]: <> (Begin:6d3f346d-45bf-4275-0e83-08d8e40a189f) ## From https://github.com/dotnet/arcade - **Subscription**: 6d3f346d-45bf-4275-0e83-08d8e40a189f - **Build**: [20250321.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2668833) - **Date Produced**: March 21, 2025 12:46:28 PM UTC - **Commit**: [235443a5c1136571cacdfd40576f263f26bf5b9b](dotnet/arcade@235443a) - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 10.0.0-beta.25164.6 to 10.0.0-beta.25171.1][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 10.0.0-beta.25164.6 to 10.0.0-beta.25171.1][1] - **Microsoft.DotNet.CodeAnalysis**: [from 10.0.0-beta.25164.6 to 10.0.0-beta.25171.1][1] [1]: dotnet/arcade@1912d9f...235443a [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 10.0.100-preview.3.25167.3 [marker]: <> (End:6d3f346d-45bf-4275-0e83-08d8e40a189f) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Instead of hardcoding several dozen llvm versions from 3.5 to 21, lets just use the latest available llvm version from LLDB.h path then find the matching liblldb version. --------- Co-authored-by: Noah Falk <noahfalk@users.noreply.github.com>
It's stated that none of the `process-id`, `name`, or `diagnostic-port` options should be configured when launching a child process with `dotnet-trace collect ... -- <child process to launch>`, yet the check only errors when all are configured. Additionally makes the exclusive check on `process-id`, `name`, `diagnosic-port`, and `dsrouter` more readable. ### Before ``` SUCCESS PS C:\Users\mihw\source\repos\mdh1418\diagnostics\latest> .\artifacts\bin\dotnet-trace\Debug\net8.0\dotnet-trace.exe collect -p 1418 --show-child-io -- dotnet package search json The runtime has been configured to pause during startup and is awaiting a Diagnostics IPC ResumeStartup command from a Diagnostic Port. DOTNET_DiagnosticPorts="dotnet-trace-26020-20250616_135956.socket,suspend,connect" DOTNET_DefaultDiagnosticPortSuspend=0 FAIL PS C:\Users\mihw\source\repos\mdh1418\diagnostics\latest> .\artifacts\bin\dotnet-trace\Debug\net8.0\dotnet-trace.exe collect -p 1418 --show-child-io -n mihw --dport whim -- dotnet package search json None of the --name, --process-id, or --diagnostic-port options may be specified when launching a child process. SUCCESS PS C:\Users\mihw\source\repos\mdh1418\diagnostics\latest> .\artifacts\bin\dotnet-trace\Debug\net8.0\dotnet-trace.exe collect -p 1418 --show-child-io -n mihw -- dotnet package search json The runtime has been configured to pause during startup and is awaiting a Diagnostics IPC ResumeStartup command from a Diagnostic Port. DOTNET_DiagnosticPorts="dotnet-trace-27244-20250616_140018.socket,suspend,connect" DOTNET_DefaultDiagnosticPortSuspend=0 ``` ### After ``` FAIL PS C:\Users\mihw\source\repos\mdh1418\diagnostics\latest> .\artifacts\bin\dotnet-trace\Debug\net8.0\dotnet-trace.exe collect -p 1418 --show-child-io -- dotnet package search json None of the --name, --process-id, or --diagnostic-port options may be specified when launching a child process. FAIL PS C:\Users\mihw\source\repos\mdh1418\diagnostics\latest> .\artifacts\bin\dotnet-trace\Debug\net8.0\dotnet-trace.exe collect -p 1418 --show-child-io -n mihw --dport whim -- dotnet package search json None of the --name, --process-id, or --diagnostic-port options may be specified when launching a child process. FAIL PS C:\Users\mihw\source\repos\mdh1418\diagnostics\latest> .\artifacts\bin\dotnet-trace\Debug\net8.0\dotnet-trace.exe collect -p 1418 --show-child-io -n mihw -- dotnet package search json None of the --name, --process-id, or --diagnostic-port options may be specified when launching a child process. ```
Partly addresses #5501 Child processes started by diagnostic tooling set a `DOTNET_DiagnosticPort` environment variable, specifying only the path. The runtime [defaults to a connect type port in suspend mode](https://github.com/dotnet/runtime/blob/22ccb0563cbb79e950b8d8e2d8bed306b125e7d8/src/native/eventpipe/ds-ipc.c#L628-L637), which isn't clear from the end user's viewpoint, as [logging will only reveal the DiagnosticPort value](https://github.com/dotnet/runtime/blob/22ccb0563cbb79e950b8d8e2d8bed306b125e7d8/src/coreclr/vm/eventing/eventpipe/ds-rt-coreclr.h#L390-L412). Instead, we can mitigate confusion by explicitly setting the config from the tooling side. ### Before ``` The runtime has been configured to pause during startup and is awaiting a Diagnostics IPC ResumeStartup command from a Diagnostic Port. DOTNET_DiagnosticPorts="dotnet-trace-48696-20250614_161420.socket" DOTNET_DefaultDiagnosticPortSuspend=0 ``` ### Now ``` The runtime has been configured to pause during startup and is awaiting a Diagnostics IPC ResumeStartup command from a Diagnostic Port. DOTNET_DiagnosticPorts="dotnet-trace-29004-20250616_134924.socket,suspend,connect" DOTNET_DefaultDiagnosticPortSuspend=0 ```
… session (#5454) In .NET 10, the EventPipe infrastructure will be leveraged to support [user_events](https://docs.kernel.org/trace/user_events.html). This PR documents the protocol for enabling a user_events-based EventPipe Session through the Diagnostics IPC protocol, where a new EventPipe Command ID `CollectTracing5` will accept necessary tracepoint configuration. As the user_events EventPipe session is not streaming based, the payload is expected to first encode a `uint output_format` to denote the session format (streaming vs user_events). Afterwards, only relevant session configuration options are to be encoded, outlined at the top of the `EventPipe Commands` section in the `Streaming Session` section, `User_events Session` section, and `Session Providers` section. For user_events EventPipe sessions, an additional tracepoint_config is to be encoded, to map Event IDs to tracepoints. This protocol expects the Client to have access to the `user_events_data` file in order to enable configuring a `user_event` EventPipe session, and expects the SCM_RIGHTS to the `user_events_data` file descriptor to be sent in the continuation stream. Additionally, as `user_events` does not support callbacks, a new event_filter config is expected to be encoded in `CollectTracing5`, to act as an allow/deny list of Event IDs that will apply post keyword/level filter.
Pretty much just adjusts what we had for Project N: * `IsProjectN` is not true for native AOT because we use the same provider GUID as JIT-based CoreCLR and not Project N (which is by design) * It is still possible to handle both Project N and native AOT the same way where it matters because both Project N and native AOT emit the same flags (`TypeFlags.ModuleBaseAddress` and `ModuleFlags.Native`) * Looks like Project N GCDump always relied on Windows kernel module load data only. I'm adding a path that can also use our own module load events (Project N also generates those) Cc @dotnet/ilc-contrib
Sync changes made for dotnet/runtime#116072 over to diagnostics repo
> [!NOTE] > This is a codeflow update. It may contain both source code changes from [the VMR](https://github.com/dotnet/dotnet) as well as dependency updates. Learn more [here](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:7e2c91d5-dafe-449a-9d20-a3d5aa478584) ## From https://github.com/dotnet/dotnet - **Subscription**: [7e2c91d5-dafe-449a-9d20-a3d5aa478584](https://maestro.dot.net/subscriptions?search=7e2c91d5-dafe-449a-9d20-a3d5aa478584) - **Build**: [20250625.6](https://dev.azure.com/dnceng/internal/_build/results?buildId=2737447) - **Date Produced**: June 25, 2025 11:39:24 PM UTC - **Commit**: [7cd445ec6160e1edbe0c96caa5aa395822403d7f](dotnet/dotnet@7cd445e) - **Commit Diff**: [f5705c8...7cd445e](dotnet/dotnet@f5705c8...7cd445e) - **Branch**: main **Updated Dependencies** - **Microsoft.DotNet.Arcade.Sdk**: [from 10.0.0-beta.25318.104 to 10.0.0-beta.25325.106][6] - **Microsoft.DotNet.CodeAnalysis**: [from 10.0.0-beta.25318.104 to 10.0.0-beta.25325.106][6] - **Microsoft.NET.Sdk**: [from 10.0.100-preview.7.25318.104 to 10.0.100-preview.7.25325.106][6] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 10.0.0-preview.7.25318.104 to 10.0.0-preview.7.25325.106][6] - **Microsoft.AspNetCore.App.Ref**: [from 10.0.0-preview.7.25318.104 to 10.0.0-preview.7.25325.106][6] - **Microsoft.NETCore.App.Ref**: [from 10.0.0-preview.7.25318.104 to 10.0.0-preview.7.25325.106][6] - **Microsoft.NETCore.Platforms**: [from 10.0.0-preview.7.25318.104 to 10.0.0-preview.7.25325.106][6] - **Microsoft.CodeAnalysis**: [from 5.0.0-1.25318.104 to 5.0.0-1.25325.106][6] - **Microsoft.CodeAnalysis.CSharp**: [from 5.0.0-1.25318.104 to 5.0.0-1.25325.106][6] - **Microsoft.CodeAnalysis.Analyzers**: [from 5.0.0-1.25318.104 to 5.0.0-1.25325.106][6] - **Microsoft.CodeAnalysis.NetAnalyzers**: [from 10.0.0-preview.25318.104 to 10.0.0-preview.25325.106][6] [marker]: <> (End:7e2c91d5-dafe-449a-9d20-a3d5aa478584) [1]: dotnet/dotnet@f5705c8...57b0396 [1]: dotnet/dotnet@57b0396...0a01b39 [1]: dotnet/dotnet@0a01b39...1b58197 [1]: dotnet/dotnet@1b58197...8041120 [1]: dotnet/dotnet@8041120...7de287d [1]: dotnet/dotnet@7de287d...d2434b1 [1]: dotnet/dotnet@d2434b1...ac2aaf2 [1]: dotnet/dotnet@ac2aaf2...62e9d32 [1]: dotnet/dotnet@62e9d32...7e27ec4 [1]: dotnet/dotnet@7e27ec4...9a90ec1 [1]: dotnet/dotnet@9a90ec1...604a661 [1]: dotnet/dotnet@604a661...20fdc50 [1]: dotnet/dotnet@20fdc50...25bec1a [1]: dotnet/dotnet@25bec1a...04b9001 [1]: dotnet/dotnet@04b9001...005f36c [1]: dotnet/dotnet@005f36c...be8cb62 [1]: dotnet/dotnet@be8cb62...2034317 [1]: dotnet/dotnet@2034317...5b76056 [1]: dotnet/dotnet@5b76056...9bcfe61 [1]: dotnet/dotnet@9bcfe61...10060d1 [2]: dotnet/dotnet@9bcfe61...105f937 [3]: dotnet/dotnet@9bcfe61...67889d9 [4]: dotnet/dotnet@9bcfe61...0b99617 [5]: dotnet/dotnet@9bcfe61...0785dfd [6]: dotnet/dotnet@9bcfe61...7cd445e [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/arcade@12d3a9f...5fe4688 - dotnet/aspnetcore@6ab9fa6...f2353d2 - dotnet/cecil@50f19cc...48fe72b - dotnet/command-line-api@77b277a...68b6dad - dotnet/deployment-tools@24142f7...ea2bdda - dotnet/efcore@d56b284...d2e60e7 - dotnet/emsdk@e59e373...d7f6017 - dotnet/fsharp@13ad646...44a24dc - dotnet/msbuild@4ad4624...21e814e - NuGet/NuGet.Client@58c248e...772ee13 - dotnet/razor@4c1a866...c60ff69 - dotnet/roslyn@533fde8...d92a029 - dotnet/roslyn-analyzers@ffec55d...aabbaa2 - dotnet/runtime@1548409...5392448 - dotnet/scenario-tests@ba23e62...6ab0ec2 - dotnet/sdk@d9960a9...0e9898b - dotnet/source-build-externals@6dcbf9f...c4bd260 - dotnet/source-build-reference-packages@535899f...31f6014 - dotnet/sourcelink@3ef121b...634059d - dotnet/symreader@d38d92c...66c6797 - dotnet/templating@55fbdd9...47d652f - microsoft/vstest@e894393...cdcfb7f - dotnet/windowsdesktop@b186f10...37ba7be - dotnet/winforms@8376cfc...ee675d3 - dotnet/wpf@e72585b...52e2951 - dotnet/xdt@7c4241a...0522205 [marker]: <> (End:Footer:CodeFlow PR) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Steve Pfister <stpfiste@microsoft.com>
Based on compliance tooling, fixed a typo in a comment
Build.sh looked at the exit code of the tee command for the native build. Check the 0th exit code for the native build. Co-authored-by: Steve Pfister <steveisok@users.noreply.github.com>
> [!NOTE] > This is a codeflow update. It may contain both source code changes from [the VMR](https://github.com/dotnet/dotnet) as well as dependency updates. Learn more [here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:7e2c91d5-dafe-449a-9d20-a3d5aa478584) ## From https://github.com/dotnet/dotnet - **Subscription**: [7e2c91d5-dafe-449a-9d20-a3d5aa478584](https://maestro.dot.net/subscriptions?search=7e2c91d5-dafe-449a-9d20-a3d5aa478584) - **Build**: [20250701.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2741231) - **Date Produced**: July 2, 2025 1:07:44 AM UTC - **Commit**: [df4663b92c2f2d25b66e44524478d9016c812949](dotnet/dotnet@df4663b) - **Commit Diff**: [7cd445e...df4663b](dotnet/dotnet@7cd445e...df4663b) - **Branch**: main **Updated Dependencies** - From [10.0.0-beta.25325.106 to 10.0.0-beta.25351.105][4] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.CodeAnalysis - From [10.0.100-preview.7.25325.106 to 10.0.100-preview.7.25351.105][4] - Microsoft.NET.Sdk - From [10.0.0-preview.7.25325.106 to 10.0.0-preview.7.25351.105][4] - Microsoft.AspNetCore.App.Ref - Microsoft.AspNetCore.App.Ref.Internal - Microsoft.NETCore.App.Ref - Microsoft.NETCore.Platforms - From [5.0.0-1.25325.106 to 5.0.0-1.25351.105][4] - Microsoft.CodeAnalysis - Microsoft.CodeAnalysis.Analyzers - Microsoft.CodeAnalysis.CSharp - From [10.0.0-preview.25325.106 to 10.0.0-preview.25351.105][4] - Microsoft.CodeAnalysis.NetAnalyzers [marker]: <> (End:7e2c91d5-dafe-449a-9d20-a3d5aa478584) [1]: dotnet/dotnet@7cd445e...1bc437c [2]: dotnet/dotnet@7cd445e...72e8593 [3]: dotnet/dotnet@7cd445e...2fd058a [4]: dotnet/dotnet@7cd445e...df4663b [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/arcade@5fe4688...0e33564 - dotnet/aspnetcore@f2353d2...9e69f19 - dotnet/deployment-tools@ea2bdda...1478b7e - dotnet/efcore@d2e60e7...14b439c - dotnet/fsharp@44a24dc...7346d84 - dotnet/msbuild@21e814e...0e2431a - dotnet/razor@c60ff69...58de0c1 - dotnet/roslyn-analyzers@aabbaa2...62b0e09 - dotnet/runtime@5392448...61f2ad6 - dotnet/sourcelink@634059d...3e1ad8d - dotnet/templating@47d652f...bbbcb1d - dotnet/windowsdesktop@37ba7be...3406b15 - dotnet/winforms@ee675d3...d93ffb3 - dotnet/wpf@52e2951...28843aa - dotnet/xdt@0522205...0d66c13 [marker]: <> (End:Footer:CodeFlow PR) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
> [!NOTE] > This is a codeflow update. It may contain both source code changes from [the VMR](https://github.com/dotnet/dotnet) as well as dependency updates. Learn more [here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:7e2c91d5-dafe-449a-9d20-a3d5aa478584) ## From https://github.com/dotnet/dotnet - **Subscription**: [7e2c91d5-dafe-449a-9d20-a3d5aa478584](https://maestro.dot.net/subscriptions?search=7e2c91d5-dafe-449a-9d20-a3d5aa478584) - **Build**: [20250701.6](https://dev.azure.com/dnceng/internal/_build/results?buildId=2741398) - **Date Produced**: July 2, 2025 9:28:11 AM UTC - **Commit**: [eaa19c281d34580a8168cff9ce1e7337da8bfe4f](dotnet/dotnet@eaa19c2) - **Commit Diff**: [df4663b...eaa19c2](dotnet/dotnet@df4663b...eaa19c2) - **Branch**: main **Updated Dependencies** - From [10.0.0-beta.25351.105 to 10.0.0-beta.25351.106][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.CodeAnalysis - From [10.0.100-preview.7.25351.105 to 10.0.100-preview.7.25351.106][1] - Microsoft.NET.Sdk - From [10.0.0-preview.7.25351.105 to 10.0.0-preview.7.25351.106][1] - Microsoft.AspNetCore.App.Ref - Microsoft.AspNetCore.App.Ref.Internal - Microsoft.NETCore.App.Ref - Microsoft.NETCore.Platforms - From [5.0.0-1.25351.105 to 5.0.0-1.25351.106][1] - Microsoft.CodeAnalysis - Microsoft.CodeAnalysis.Analyzers - Microsoft.CodeAnalysis.CSharp - From [10.0.0-preview.25351.105 to 10.0.0-preview.25351.106][1] - Microsoft.CodeAnalysis.NetAnalyzers [marker]: <> (End:7e2c91d5-dafe-449a-9d20-a3d5aa478584) [1]: dotnet/dotnet@df4663b...eaa19c2 [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/sdk@0e9898b...4177291 [marker]: <> (End:Footer:CodeFlow PR) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
- **Update TPN** - **Add TPN to all global tool packages**
Changing the cmd line tooling implementation in the following commit: 6837b8f#diff-d33d6d23aba37ebcfc05462b2fa260136a11df1b03f129f1912a856c36a8d7f3 broke Ctrl+C handling in dotnet-trace, since it disabled the process termination handler leading to process termination without being able to close the session, creating a corrupt file. dotnet-trace and dotnet-dsrouter tooling needs better control of its Ctrl+C shutdown, so this commit implements a custom process termination handler and disable the default handler implemented by the cmd line tools. This handler makes sure to signal a cancelation token if one of the configured signals hits the process. This commit also fix an issue with the integrated execution of dsrouter from other tools. Since Ctrl+C gets passed to child processes, integrated dsrouter could stop before dotnet-trace was able to close the session causing corrupt trace file and exception being logged in dotnet-trace. To mitigate this, dsrouter implements a way to block signals only accepting shutdown sequence on redirected stdin and dotnet-trace will launch dsrouter in this mode. This makes the shutdown sequence deterministic making sure dsrouter won't stop before dotnet-trace completed any outstanding trace sessions.
[main] Update dependencies from microsoft/clrmd
…fix P/Invoke buffer handling (#5523) - Updated `MicrosoftDiagnosticsTracingTraceEventVersion` from `3.1.21` to `3.1.23` in `eng/Versions.props` ## Tools Affected This centralized version update automatically applies to all diagnostic tools that use the TraceEvent library: - ✅ `dotnet-stack` (specifically mentioned in the issue) - ✅ `dotnet-gcdump` (specifically mentioned in the issue) - ✅ `dotnet-counters` - ✅ `dotnet-trace` - ✅ `dotnet-dsrouter` Fixes #5508. Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: hoyosjs <19413848+hoyosjs@users.noreply.github.com>
#5354) This started out as a bit of test logging. Then the unrelated GetProcessInfo test failed in CI so the change grew into a small product fix + more test improvements. Product changes: - Connecting to the IPC channel might fail when the runtime is starting up, shutting down, or is overloaded. If so the socket.Connect() call is going to throw a SocketException. In order to avoid having callers to DiagnosticClient APIs understand all the implrementation details and have to use catch clauses for a wide variety of different exceptions we now catch this exception and rethrow it wrapped as a ServerNotAvailableException. Test changes: - Add logging to the DuplicateMetricNames test to improve diagnostics when it hangs. - Add retries to the GetProcessInfo requests that are running while the target process is starting up. There is no guarantee the runtime is listening to the socket at this point and connection requests may be refused. This may resolve one cause of flakiness noted in #2760. The issue also shows a 'ReadPastEndOfStream' problem that is not addressed by this fix. - Add verification that the ExePath returned by DebuggeeCompiler actually exists on disk. This catches some build/config issues in the test setup more eagerly. - Add verification that the BuildProjectFramework and TargetConfiguration used by SdkPrebuiltDebuggeeCompiler are populated. This catches some specific test configuration errors more eagerly. - Tweaked some out-of-date comments --------- Co-authored-by: Mitchell Hwang <16830051+mdh1418@users.noreply.github.com>
#5517) Closes dotnet/runtime#111165 This PR adds better diagnostic messages in the scenario of too-long TMPDIR values on Linux that cause the diagnostic socket to be absent or incorrectly named. --------- Co-authored-by: Rachel Jarvi <racheljarvi@microsoft.com> Co-authored-by: Noah Falk <noahfalk@users.noreply.github.com>
Create a InstallNativePackages.proj that downloads the native diasymreader and cdac packages. Note that cdac packages are opt in via `PackageWithCDac`. Add InstallNativePackages to native-prereqs.proj Move the native binary copies out of the build.sh/build-native.cmd scripts to the appropriate managed project Move the rest of the binary copying from the cmake files to the managed projects Switch the Windows native builds to use ninja. Add the -msbuild/-ninja build-native.cmd options. --------- Co-authored-by: Mike McLaughlin <mikem@microsoft.com> Co-authored-by: Steve Pfister <stpfiste@microsoft.com>
Context: #5494 Context: #5241 Fixes: #5435 We added `--dsrouter` switch to both `dotnet-trace` and `dotnet-gcdump`, which runs `dotnet-dsrouter` as a child process. Many of `dotnet-dsrouter`'s console messages are pretty useful for developers, but we are simply ignoring them: private static async Task ReadAndIgnoreAllStreamAsync(StreamReader streamToIgnore, CancellationToken cancelToken) { Memory<char> memory = new char[4096]; while (await streamToIgnore.ReadAsync(memory, cancelToken).ConfigureAwait(false) != 0) { } } To make this a bit more useful, we now log the output to either `Console.Out` or `Console.Error` where appropriate. If we simply did: string line; while ((line = await streamToRead.ReadLineAsync(cancelToken).ConfigureAwait(false)) != null) { output.WriteLine(line); } This would work fine, but we'd lose all coloring. `dotnet-dsrouter` uses `SimpleConsoleFormatter` to colorize its output: https://github.com/dotnet/runtime/blob/aadcceeb03ce0ecbc2ad645de0feb10189daa64c/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs#L163-L199 So, for now, a very simple solution is to check the known prefixes and add coloring. This looks to have a pretty good result. I also dropped the duplicate message: WARNING: dotnet-dsrouter is a development tool not intended for production environments. Now that we print all of `dotnet-dsrouter`'s output, we can handle this case and color it yellow. <img width="2524" height="582" alt="image" src="https://github.com/user-attachments/assets/4924ec93-c616-4511-83f8-f318f4ce4471" />
noahfalk
approved these changes
Jul 23, 2025
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.
No description provided.