Skip to content

Commit 68aa60a

Browse files
hoyosjshoyosjs
authored
[Release] Snap main branch for release (#5786)
Copilot aided release notes for user facing changes --------------------------------------------------------------------- Breaking Changes - COMPLUS_* environment variable references removed from SOS — use DOTNET_* equivalents (#5714) - !name2ee and !token2ee output is now less verbose; modules that don't contain the requested type are no longer listed (#5719) dotnet-dump / SOS New features: - Add -stat flag to !threadpool to summarize queued work items by type (#5737) - Add sort-by-count option to !dumpheap (#5722) - Add -noprogress flag to !dumpheap and !verifyheap to suppress progress reporting (#5773) - Add -all flag to DumpMT to show class details and method descriptors in one command (#5701) - !DumpStackObjects now finds objects correctly during stack overflow scenarios on Linux (#5723) - Warn when loading a dump not collected by createdump, as SOS commands may produce incomplete results (#5720) - SOS output is now captured correctly by LLDB Python scripts and tools like lldb-dap (#5728) Bug fixes: - Fix !u failing on IL stubs (#5726) - Fix DumpIL showing a cryptic error on IL stubs — now explains IL is unavailable (#5731) - Fix clrstack -l displaying incorrect values for ushort locals ≥ 0x8000 (#5721) dotnet-trace / collect-linux - Enable callstack capture for .NET runtime events in collect-linux — exception and GC stacks now include resolved frames (#5756) - collect-linux --probe now gracefully handles unreachable processes instead of throwing (#5705) - Fix crash in collect-linux in environments without terminal cursor support (#5771) - Fix collect-linux throwing when stdin/stdout are redirected (e.g. piped or scripted) (#5745) - Fix terminal cursor not being restored after collect-linux exits (#5747, #5707) dotnet-counters - Add --noAbbreviateValues option to monitor to display full-precision values without K/M/G abbreviation (#5734) Diagnostic Tools (general) - Fix WriteDump failing when the dump path contains spaces on Windows (#5593) - Diagnostic tools now work from sidecar containers — dotnet-trace, dotnet-counters, dotnet-stack, and dotnet-dump can attach to processes in other containers without manual socket configuration (#5735) Libraries - Improved symbol resolution performance by caching failed lookups (#5729) - Symbol server key generation now supports ELF binaries from custom toolchains (#5736)
2 parents 08c30c0 + 852c6b6 commit 68aa60a

104 files changed

Lines changed: 3731 additions & 1256 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/Dockerfile‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
2-
# For specifics about the dotnet base container see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
1+
# See https://github.com/devcontainers/images/tree/main/src/dotnet/
2+
ARG VARIANT="10.0-noble"
3+
FROM mcr.microsoft.com/devcontainers/dotnet:${VARIANT}
34

4-
# [Choice] .NET version: 6.0, 5.0, 3.1, 2.1
5-
ARG VARIANT="6.0-focal"
6-
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
5+
RUN bash -i -c 'nvm install --lts' && npm install -g @github/copilot
76

8-
# Set up machine requirements to build the repo
97
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
10-
&& apt-get -y install --no-install-recommends cmake clang \
11-
curl gdb gettext git libicu-dev lldb liblldb-dev libunwind8 \
12-
llvm make python python-lldb tar wget zip
8+
&& apt-get -y install --no-install-recommends \
9+
clang \
10+
cmake \
11+
cpio \
12+
build-essential \
13+
python3 \
14+
curl \
15+
git \
16+
lldb \
17+
llvm \
18+
liblldb-dev \
19+
libunwind8 \
20+
libunwind8-dev \
21+
liblttng-ust-dev \
22+
ninja-build \
23+
&& apt-get clean \
24+
&& rm -rf /var/lib/apt/lists/*

‎.devcontainer/devcontainer.json‎

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,45 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet
31
{
4-
"name": "C# (.NET)",
2+
"name": "Diagnostics - Contribute",
53
"build": {
6-
"dockerfile": "Dockerfile",
7-
"args": {
8-
// Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0
9-
"VARIANT": "6.0",
10-
// Options
11-
"NODE_VERSION": "lts/*"
12-
}
4+
"dockerfile": "Dockerfile"
135
},
14-
15-
"settings": {
16-
// Loading projects on demand is better for larger codebases
17-
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
18-
"omnisharp.enableRoslynAnalyzers": true,
19-
"omnisharp.enableEditorConfigSupport": true,
20-
"omnisharp.enableAsyncCompletion": true,
6+
"hostRequirements": {
7+
"cpus": 4,
8+
"memory": "8gb",
9+
"storage": "64gb"
2110
},
22-
23-
// Add the IDs of extensions you want installed when the container is created.
24-
"extensions": [
25-
"ms-dotnettools.csharp",
26-
"ms-vscode.cpptools-extension-pack"
27-
],
28-
29-
// Needed to debug sos extension under container.
30-
"privileged": true,
11+
"features": {
12+
"ghcr.io/devcontainers/features/github-cli:1": {},
13+
"ghcr.io/devcontainers/features/docker-in-docker": {}
14+
},
15+
"customizations": {
16+
"codespaces": {
17+
"extensions": [
18+
"ms-dotnettools.csdevkit",
19+
"GitHub.copilot",
20+
"GitHub.copilot-chat"
21+
],
22+
"settings": {
23+
"remote.autoForwardPorts": true,
24+
"remote.autoForwardPortsSource": "hybrid",
25+
"remote.otherPortsAttributes": {
26+
"onAutoForward": "ignore"
27+
},
28+
"dotnet.defaultSolution": "build.sln"
29+
}
30+
}
31+
},
32+
"postStartCommand": "${containerWorkspaceFolder}/dotnet.sh --info",
33+
"capAdd": [ "SYS_PTRACE" ],
3134

3235
// Add the locally installed dotnet to the path to ensure that it is activated
3336
// This allows developers to just use 'dotnet build' on the command-line, and the local dotnet version will be used.
3437
// Add the global tools dir to the PATH so that globally installed tools will work
3538
"remoteEnv": {
36-
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerWorkspaceFolder}/.dotnet-tools-global:${containerEnv:PATH}",
37-
"DOTNET_MULTILEVEL_LOOKUP": "0"
39+
"PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}"
3840
},
3941

4042
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
43+
// This one is defined by common-utils in the dotnet devcontainer base image.
4144
"remoteUser": "vscode"
42-
}
45+
}

‎NuGet.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-dotnet -->
10-
<add key="darc-pub-dotnet-dotnet-5ddd0dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-5ddd0ddc/nuget/v3/index.json" />
1110
<!-- End: Package sources from dotnet-dotnet -->
1211
<!-- Begin: Package sources from dotnet-aspnetcore -->
1312
<!-- End: Package sources from dotnet-aspnetcore -->

‎diagnostics.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ extends:
237237
- template: /eng/pipelines/build.yml
238238
parameters:
239239
jobTemplate: ${{ variables.jobTemplate }}
240-
name: Alpine3_19
240+
name: Alpine3_23
241241
osGroup: Linux
242242
osSuffix: -musl
243243
container: test_linux_musl_x64
@@ -255,9 +255,9 @@ extends:
255255
- template: /eng/pipelines/build.yml
256256
parameters:
257257
jobTemplate: ${{ variables.jobTemplate }}
258-
name: Debian_Bullseye
258+
name: Debian_Trixie
259259
osGroup: Linux
260-
container: test_debian_11_amd64
260+
container: test_debian_13_amd64
261261
dependsOn: Linux
262262
testOnly: true
263263
buildConfigs:
@@ -270,7 +270,7 @@ extends:
270270
- template: /eng/pipelines/build.yml
271271
parameters:
272272
jobTemplate: ${{ variables.jobTemplate }}
273-
name: Fedora_39
273+
name: Fedora_43
274274
osGroup: Linux
275275
container: test_fedora
276276
dependsOn: Linux

‎documentation/FAQ.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Frequently Asked Questions
7373
7474
If that doesn't work, try using the `setclrpath <directory>` command with a directory that contains the matching version of the DAC module. This is useful for private runtimes or debug builds that haven't been published to our symbol servers.
7575
76-
If this is a dump, the problem could also be that the dump is missing some memory required by SOS. Try generating a "full" dump (the default with `dotnet-dump collect` without a `--type` option) or add setting the crash dump generation (createdump) environment variable `DOTNET_DbgMiniDumpType=4` (.NET 6 and below require `COMPlus_` prefix instead of `DOTNET_`). For more details on crash dump generation see [here](https://docs.microsoft.com/en-us/dotnet/core/diagnostics/dumps#collecting-dumps-on-crash).
76+
If this is a dump, the problem could also be that the dump is missing some memory required by SOS. Try generating a "full" dump (the default with `dotnet-dump collect` without a `--type` option) or add setting the crash dump generation (createdump) environment variable `DOTNET_DbgMiniDumpType=4`. For more details on crash dump generation see [here](https://docs.microsoft.com/en-us/dotnet/core/diagnostics/dumps#collecting-dumps-on-crash).
7777
7878
* If you receive this error message executing a SOS command:
7979
```

‎eng/Version.Details.props‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,45 @@ This file should be imported by eng/Versions.props
55
-->
66
<Project>
77
<PropertyGroup>
8-
<!-- microsoft/clrmd dependencies -->
9-
<MicrosoftDiagnosticsRuntimePackageVersion>4.0.0-beta.26072.1</MicrosoftDiagnosticsRuntimePackageVersion>
10-
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.0.0-beta.26072.1</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
11-
<!-- dotnet/command-line-api dependencies -->
12-
<SystemCommandLinePackageVersion>2.0.0-beta5.25210.1</SystemCommandLinePackageVersion>
13-
<!-- dotnet/android dependencies -->
8+
<!-- dotnet-android dependencies -->
149
<XamarinAndroidToolsAndroidSdkPackageVersion>1.0.105-preview.225</XamarinAndroidToolsAndroidSdkPackageVersion>
15-
<!-- dotnet/arcade dependencies -->
16-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26066.3</MicrosoftDotNetArcadeSdkPackageVersion>
17-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26066.3</MicrosoftDotNetCodeAnalysisPackageVersion>
10+
<!-- dotnet-arcade dependencies -->
11+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26177.7</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26177.7</MicrosoftDotNetCodeAnalysisPackageVersion>
1813
<MicrosoftDotNetRemoteExecutorPackageVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorPackageVersion>
19-
<!-- dotnet/dotnet dependencies -->
20-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.2</MicrosoftAspNetCoreAppRefPackageVersion>
21-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.2-servicing.25603.103</MicrosoftAspNetCoreAppRefInternalPackageVersion>
22-
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisPackageVersion>
23-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisAnalyzersPackageVersion>
24-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisCSharpPackageVersion>
25-
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.102</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
26-
<MicrosoftNETSdkPackageVersion>10.0.102-servicing.25603.103</MicrosoftNETSdkPackageVersion>
27-
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
28-
<MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25603.103</MicrosoftNETCorePlatformsPackageVersion>
29-
<runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
30-
<runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
31-
<runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
32-
<runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
33-
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
34-
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
14+
<!-- dotnet-command-line-api dependencies -->
15+
<SystemCommandLinePackageVersion>2.0.0-beta5.25210.1</SystemCommandLinePackageVersion>
16+
<!-- dotnet-dotnet dependencies -->
17+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.5</MicrosoftAspNetCoreAppRefPackageVersion>
18+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.5-servicing.26153.111</MicrosoftAspNetCoreAppRefInternalPackageVersion>
19+
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.26153.111</MicrosoftCodeAnalysisPackageVersion>
20+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.26153.111</MicrosoftCodeAnalysisAnalyzersPackageVersion>
21+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.26153.111</MicrosoftCodeAnalysisCSharpPackageVersion>
22+
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.105</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
23+
<MicrosoftNETSdkPackageVersion>10.0.105-servicing.26153.111</MicrosoftNETSdkPackageVersion>
24+
<MicrosoftNETCoreAppRefPackageVersion>10.0.5</MicrosoftNETCoreAppRefPackageVersion>
25+
<MicrosoftNETCorePlatformsPackageVersion>10.0.5-servicing.26153.111</MicrosoftNETCorePlatformsPackageVersion>
26+
<runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.5-servicing.26153.111</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
27+
<runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.5-servicing.26153.111</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
28+
<runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.5-servicing.26153.111</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
29+
<runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.5-servicing.26153.111</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
30+
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.5-servicing.26153.111</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
31+
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.5-servicing.26153.111</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
32+
<!-- microsoft-clrmd dependencies -->
33+
<MicrosoftDiagnosticsRuntimePackageVersion>4.0.0-beta.26072.1</MicrosoftDiagnosticsRuntimePackageVersion>
34+
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.0.0-beta.26072.1</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
3535
</PropertyGroup>
3636
<!--Property group for alternate package version names-->
3737
<PropertyGroup>
38-
<!-- microsoft/clrmd dependencies -->
39-
<MicrosoftDiagnosticsRuntimeVersion>$(MicrosoftDiagnosticsRuntimePackageVersion)</MicrosoftDiagnosticsRuntimeVersion>
40-
<MicrosoftDiagnosticsRuntimeUtilitiesVersion>$(MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion)</MicrosoftDiagnosticsRuntimeUtilitiesVersion>
41-
<!-- dotnet/command-line-api dependencies -->
42-
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
43-
<!-- dotnet/android dependencies -->
38+
<!-- dotnet-android dependencies -->
4439
<XamarinAndroidToolsAndroidSdkVersion>$(XamarinAndroidToolsAndroidSdkPackageVersion)</XamarinAndroidToolsAndroidSdkVersion>
45-
<!-- dotnet/arcade dependencies -->
40+
<!-- dotnet-arcade dependencies -->
4641
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
4742
<MicrosoftDotNetCodeAnalysisVersion>$(MicrosoftDotNetCodeAnalysisPackageVersion)</MicrosoftDotNetCodeAnalysisVersion>
4843
<MicrosoftDotNetRemoteExecutorVersion>$(MicrosoftDotNetRemoteExecutorPackageVersion)</MicrosoftDotNetRemoteExecutorVersion>
49-
<!-- dotnet/dotnet dependencies -->
44+
<!-- dotnet-command-line-api dependencies -->
45+
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
46+
<!-- dotnet-dotnet dependencies -->
5047
<MicrosoftAspNetCoreAppRefVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</MicrosoftAspNetCoreAppRefVersion>
5148
<MicrosoftAspNetCoreAppRefInternalVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</MicrosoftAspNetCoreAppRefInternalVersion>
5249
<MicrosoftCodeAnalysisVersion>$(MicrosoftCodeAnalysisPackageVersion)</MicrosoftCodeAnalysisVersion>
@@ -62,5 +59,8 @@ This file should be imported by eng/Versions.props
6259
<runtimeosxx64MicrosoftDotNetCdacTransportVersion>$(runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion)</runtimeosxx64MicrosoftDotNetCdacTransportVersion>
6360
<runtimewinarm64MicrosoftDotNetCdacTransportVersion>$(runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion)</runtimewinarm64MicrosoftDotNetCdacTransportVersion>
6461
<runtimewinx64MicrosoftDotNetCdacTransportVersion>$(runtimewinx64MicrosoftDotNetCdacTransportPackageVersion)</runtimewinx64MicrosoftDotNetCdacTransportVersion>
62+
<!-- microsoft-clrmd dependencies -->
63+
<MicrosoftDiagnosticsRuntimeVersion>$(MicrosoftDiagnosticsRuntimePackageVersion)</MicrosoftDiagnosticsRuntimeVersion>
64+
<MicrosoftDiagnosticsRuntimeUtilitiesVersion>$(MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion)</MicrosoftDiagnosticsRuntimeUtilitiesVersion>
6565
</PropertyGroup>
6666
</Project>

0 commit comments

Comments
 (0)