Skip to content

Backport some changes to release - #5968

Merged
hoyosjs merged 5 commits into
dotnet:release/stablefrom
hoyosjs:juhoyosa/rel-port
Aug 19, 2026
Merged

hoyosjs merged 5 commits into
dotnet:release/stablefrom
hoyosjs:juhoyosa/rel-port

Conversation

@hoyosjs

@hoyosjs hoyosjs commented Aug 19, 2026

Copy link
Copy Markdown
Member

hoyosjs and others added 4 commits August 18, 2026 23:39
…im (dotnet#5919)

GetTargetCLRMetrics dereferenced the DotNetRuntimeInfo export returned
by PEDecoder::GetExport without verifying the whole RuntimeInfo struct
lies within the module. Add a CheckRva over sizeof(RuntimeInfo) before
reading it, matching the existing bounds checks on the engine-metrics
path.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This PR changes diagnostics CI from "build and test in every leg" to
"build once, then run separate test legs from published artifacts".

New state:
- the `build` stage produces the binaries/debuggees/test assets once
- the `test` stage depends on those build jobs and runs tests from
downloaded artifacts - it also installs the appropriate SDKs
- tools stay on **net8**, but unit tests move to **net10** to avoid
installing more runtimes.
- a couple of overly noisy MSBuild messages are downgraded

- `diagnostics.yml` and `eng/pipelines/build.yml` now model build and
test as separate stages/jobs. Build legs publish `TestArtifacts_*`;
test-only legs download them and run `test.cmd`/`test.sh`.
- Build legs now publish `bin/**`, `obj/**`, and `test/**` so test legs
can run from prebuilt outputs.
- `eng/build.ps1` / `eng/build.sh` explicitly install test runtimes on
`-skipmanaged` legs and pass `SkipTestArtifactsBuild=true` so debuggees
are not rebuilt there.
- `eng/TraversalOverrides.targets` is imported after the Traversal SDK
and clears `TestDependsOn` when `SkipTestArtifactsBuild=true`. That is
the key fix that actually stops implicit build-before-test.
- `src/tests/dirs.proj` skips `BuildDebuggees` on those prebuilt test
legs.
- Test TFMs now use `$(NetCoreAppTestTargetFramework)` (`net10.0`) while
tool TFMs remain `$(NetCoreAppMinTargetFramework)` (`net8.0`), which
lets us drop the extra net8 test runtime install from `global.json`.
- `global.json` keeps an x86 runtime, but now at net10, so Arcade can
launch an x86 host on the x86 leg.
- `EventLogsPipelineUnitTests` replaces `reader.EndOfStream` assertions
with `ReadToEndAsync()` checks so those tests remain stable on the newer
runtime.
- Logging cleanup:
- `eng/AuxMsbuildFiles/SdkPackOverrides.targets`: `High -> Low` (from
- `src/tests/SOS.UnitTests/Debuggees/Directory.Build.targets`: skip
message lowered

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Using ReadLine + IsNullOrEmpty + continue:

```C#
string line = Console.ReadLine();
if (string.IsNullOrEmpty(line))
    continue;
```

Produces an infinite loop if stdin was closed. For example, running
under an llm and it closes the pipe to the tool.

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@hoyosjs
hoyosjs requested a review from a team as a code owner August 19, 2026 07:09
@hoyosjs
hoyosjs enabled auto-merge August 19, 2026 07:29
noahfalk
noahfalk previously approved these changes Aug 19, 2026
@hoyosjs

hoyosjs commented Aug 19, 2026

Copy link
Copy Markdown
Member Author

/ba-g all failures are in restore - not in SOS or tool infra

@hoyosjs
hoyosjs disabled auto-merge August 19, 2026 17:13
@hoyosjs
hoyosjs merged commit a0b7273 into dotnet:release/stable Aug 19, 2026
23 of 25 checks passed
@hoyosjs
hoyosjs deleted the juhoyosa/rel-port branch August 19, 2026 17:15
@github-actions github-actions Bot locked and limited conversation to collaborators Sep 19, 2026
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.

5 participants